2 files changed, 18 insertions(+), 18 deletions(-)

M config.go
M config_test.go

@@ 11,7 11,7 @@ import (
 
 // Used to decode an election in the JSON elections file, which will be a list
 // of these.  Maps the election key to the election metadata
-type ElectionConfigs map[string]struct{
+type RawElections map[string]struct{
 	// Our private key in base58. TODO: encrypt
 	PrivKey     string
 	// Our public key in base58. Kept in addition to the private key to


@@ 35,11 35,11 @@ func resumeElectionMaybe(electionKey string) *Election {
 	return nil
 }
 
-func decodeElections(reader io.Reader) (electionConfigs ElectionConfigs) {
+func decodeElections(reader io.Reader) (rawElections RawElections) {
 	decoder := json.NewDecoder(reader)
-	err := decoder.Decode(&electionConfigs)
+	err := decoder.Decode(&rawElections)
 	if err != nil {
 		panic(err)
 	}
-	return electionConfigs
+	return rawElections
 }

@@ 11,7 11,7 @@ const (
 	ek1 = "Dmfo6renA9YKuTFdGL4iSP5fcHbxHG4Qc9XTHkBzdHPa0QmVjm2QACdwMYguMtMooDoLsiagyVfe7qwxpuzUmX1stTM"
 )
 
-var elections = ElectionConfigs{
+var rawElectionsRef = RawElections{
 	ek0:
 	{
 		PrivKey:  "7r1r8iBFRYi5hLWbNS5vx53fAvnyFFGrgnDEwu8DSGRVdik5TVuPhCBpqummjaMMXgogcoz6h88rEWvM1af5G4VV4t5cNeFF6hXDyM14gxAMBkm2cEgpcf7d3AAH4auiHhZcB5XWUZeGKUgjz2WGtLPChHhAZzCA8GnDZHhrLSL2qfSt1ZYhyyvTLbEvfNZ7VhwXK64Y4UxjaRAXsMpBCret9aAck9pJxJnE5gm91JxTQybcTKULN9BxvJV99kLUdZ66PJ6ff5TZB4oNzShEQcdyP2G8tUJkCujokXWpZQh7ZDE4dtuoP6uvQhYSkPtWTgYv888BRYDoNDDqWc1nqZGqftr5EHogUTC4H7D3UWngVpwd1Mjbi8vS2DicKDXwJqP2bSyeVGLG3yLkWyjfxfBwNwnHGcBmhiSrL6bHfUrpJqy95UPC3ZSJeLNaYEToQAJmCEah4D7BZchF13rXjLGMsXxTUTHt9mMmEa8jdxLbqUkafVsN1VcHeZBVScvnFCS1e4xe1Ja54xg8H7b5HddB8JcSHaW2fJkvTrr3avT24NivAw4nvRg5UasMR2WMzgYP1rkmyV5vyPoJAnytYX8hZp2zX6gPbZBqUEDAQcvAegibjcDhRZMxMLCrR73UReEqXjjFhKYh7AsDz6uNDrwE6oVRJZ9GLBAetQ9HothETXr2PUaFkh82zCCCYbNL16aFWgiKYBAd1iaKL7idA4GrzTXuYR5HHJxcGSXNc9mUrGEEY2tLkNLPk3VHrqEDpzKArA72PGy1mKXVghoaJeZAe5am49ZPuPG4VQnkxHXB8NkhPkc26cbD6iYxq1cC7XDEMrQ8ggvecjhFxVnnFsDE2Ub7cZyVompvckPMX7R7VuERq7Ax1Vk4qNgbP5hHpn5F5DGpRNRdtpsEpzseSvBKQ6nDknSXFYSya99b4T7nwVkYCj7KuD21Xfmj4mRYQxy4aebKggUvPWAmMNSTWdrPK9QF7Y2cwagpDYQx8KEcVgGU5CrCeKscAbc84PbP6H2HMaMB5ivdMmuEbQfJuyMpX7sXwXCvHUg4p8R4UMf7nkF5c76H4oRH2CaJnnQ25DwYtMtfWmidTFFJECtaLU154z47L2TzNtn3G16UtUNvyLBA5b5HBKhKcjzwVHmRBreWz3urCF1obBT49mERb9mrsyicYjfoKqXS1mVVVCkvs1vAEm73RepXBHD37aQ4DVk9ThFB2RMiDxCwaW7EYUkNLpRaH1FHPJg2o9x1EkPsqcTg5TL31e3EctivtyLCVPLsaUsFYFmzyXCsniXeJPdPGxvt32fbeP1GUXv8N2xLAoVg815cuEnGvkjvztLK8Mv2fxtsPGQaEH6D9FEM2x1xRAFj6cspkbC5RpEbTcuEaaXBpBgVZSxT7TkYWUyerSYKLhocacwmGSYgduxvTB5w1nTfbk3sobEEjCrZwZjiQzdwkrP1iG4x1YDSB4f97n7gnbkEs5LDvuDwgS6KBeWnWTw1V2P5U8VkTCFhj6UAiv1FP9Tdi664MgDVNXQoEGQryy98zShcyg3BZ2Jr8yCdri3gVgMLG7b6Q91AXehz4RRs2X6SrZtCLKN2uBmhGwntvL2FvXDkGanXuRfUEMP8g2VdtWuW8",


@@ 24,40 24,40 @@ var elections = ElectionConfigs{
 	},
 }
 
-func TestElectionConfigDecoding(t *testing.T) {
+func TestRawElectionDecoding(t *testing.T) {
 	jsonStream := fmt.Sprintf(`
 	{"%s": {"PrivKey": "%s",
 		"PubKey":  "%s"},
 	 "%s": {"PrivKey": "%s",
 		"PubKey":  "%s"}}`,
 		ek0,
-		elections[ek0].PrivKey,
-		elections[ek0].PubKey,
+		rawElectionsRef[ek0].PrivKey,
+		rawElectionsRef[ek0].PubKey,
 		ek1,
-		elections[ek1].PrivKey,
-		elections[ek1].PubKey,
+		rawElectionsRef[ek1].PrivKey,
+		rawElectionsRef[ek1].PubKey,
 	)
-	electionConfigs := decodeElections(strings.NewReader(jsonStream))
+	rawElections := decodeElections(strings.NewReader(jsonStream))
 
-	if len(electionConfigs) != 2 {
+	if len(rawElections) != 2 {
 		t.FailNow()
 	}
-	if _, exists := electionConfigs[ek0]; !exists {
+	if _, exists := rawElections[ek0]; !exists {
 		t.FailNow()
 	}
-	if _, exists := electionConfigs[ek1]; !exists {
+	if _, exists := rawElections[ek1]; !exists {
 		t.FailNow()
 	}
-	if electionConfigs[ek0].PrivKey != elections[ek0].PrivKey {
+	if rawElections[ek0].PrivKey != rawElectionsRef[ek0].PrivKey {
 		t.FailNow()
 	}
-	if electionConfigs[ek1].PrivKey != elections[ek1].PrivKey {
+	if rawElections[ek1].PrivKey != rawElectionsRef[ek1].PrivKey {
 		t.FailNow()
 	}
-	if electionConfigs[ek0].PubKey != elections[ek0].PubKey {
+	if rawElections[ek0].PubKey != rawElectionsRef[ek0].PubKey {
 		t.FailNow()
 	}
-	if electionConfigs[ek1].PubKey != elections[ek1].PubKey {
+	if rawElections[ek1].PubKey != rawElectionsRef[ek1].PubKey {
 		t.FailNow()
 	}
 }