From 232f6e2106468c3928114008a0aa26e1defa5bbc Mon Sep 17 00:00:00 2001
From: David Florness <david@florness.com>
Date: Thu, 18 Jun 2020 11:52:56 -0600
Subject: [PATCH] In the elections config file, use the election key as JSON
 keys

---
 config.go      |  7 +++--
 config_test.go | 69 ++++++++++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/config.go b/config.go
index 768bfda..ee2cfa0 100644
--- a/config.go
+++ b/config.go
@@ -10,9 +10,8 @@ import (
 )
 
 // Used to decode an election in the JSON elections file, which will be a list
-// of these.
-type ElectionConfig struct{
-	ElectionKey string
+// of these.  Maps the election key to the election metadata
+type ElectionConfigs 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
@@ -36,7 +35,7 @@ func resumeElectionMaybe(electionKey string) *Election {
 	return nil
 }
 
-func decodeElections(reader io.Reader) (electionConfigs []ElectionConfig) {
+func decodeElections(reader io.Reader) (electionConfigs ElectionConfigs) {
 	decoder := json.NewDecoder(reader)
 	err := decoder.Decode(&electionConfigs)
 	if err != nil {
diff --git a/config_test.go b/config_test.go
index 3fd88fb..5eeb13a 100644
--- a/config_test.go
+++ b/config_test.go
@@ -6,14 +6,19 @@ import (
 	"testing"
 )
 
-var elections = [2]ElectionConfig{
+const (
+	ek0 = "DpgZ3EG8cyNAxrbGejTTUuJB6KkvKVGK9WEpQWDh6RLd0QmVitsctABm8xbadtkqU46WMLCjuAadUR2RAkjaPf7xz7X"
+	ek1 = "Dmfo6renA9YKuTFdGL4iSP5fcHbxHG4Qc9XTHkBzdHPa0QmVjm2QACdwMYguMtMooDoLsiagyVfe7qwxpuzUmX1stTM"
+)
+
+var elections = ElectionConfigs{
+	ek0:
 	{
-		ElectionKey: "DpgZ3EG8cyNAxrbGejTTUuJB6KkvKVGK9WEpQWDh6RLd0QmVitsctABm8xbadtkqU46WMLCjuAadUR2RAkjaPf7xz7X",
 		PrivKey:  "7r1r8iBFRYi5hLWbNS5vx53fAvnyFFGrgnDEwu8DSGRVdik5TVuPhCBpqummjaMMXgogcoz6h88rEWvM1af5G4VV4t5cNeFF6hXDyM14gxAMBkm2cEgpcf7d3AAH4auiHhZcB5XWUZeGKUgjz2WGtLPChHhAZzCA8GnDZHhrLSL2qfSt1ZYhyyvTLbEvfNZ7VhwXK64Y4UxjaRAXsMpBCret9aAck9pJxJnE5gm91JxTQybcTKULN9BxvJV99kLUdZ66PJ6ff5TZB4oNzShEQcdyP2G8tUJkCujokXWpZQh7ZDE4dtuoP6uvQhYSkPtWTgYv888BRYDoNDDqWc1nqZGqftr5EHogUTC4H7D3UWngVpwd1Mjbi8vS2DicKDXwJqP2bSyeVGLG3yLkWyjfxfBwNwnHGcBmhiSrL6bHfUrpJqy95UPC3ZSJeLNaYEToQAJmCEah4D7BZchF13rXjLGMsXxTUTHt9mMmEa8jdxLbqUkafVsN1VcHeZBVScvnFCS1e4xe1Ja54xg8H7b5HddB8JcSHaW2fJkvTrr3avT24NivAw4nvRg5UasMR2WMzgYP1rkmyV5vyPoJAnytYX8hZp2zX6gPbZBqUEDAQcvAegibjcDhRZMxMLCrR73UReEqXjjFhKYh7AsDz6uNDrwE6oVRJZ9GLBAetQ9HothETXr2PUaFkh82zCCCYbNL16aFWgiKYBAd1iaKL7idA4GrzTXuYR5HHJxcGSXNc9mUrGEEY2tLkNLPk3VHrqEDpzKArA72PGy1mKXVghoaJeZAe5am49ZPuPG4VQnkxHXB8NkhPkc26cbD6iYxq1cC7XDEMrQ8ggvecjhFxVnnFsDE2Ub7cZyVompvckPMX7R7VuERq7Ax1Vk4qNgbP5hHpn5F5DGpRNRdtpsEpzseSvBKQ6nDknSXFYSya99b4T7nwVkYCj7KuD21Xfmj4mRYQxy4aebKggUvPWAmMNSTWdrPK9QF7Y2cwagpDYQx8KEcVgGU5CrCeKscAbc84PbP6H2HMaMB5ivdMmuEbQfJuyMpX7sXwXCvHUg4p8R4UMf7nkF5c76H4oRH2CaJnnQ25DwYtMtfWmidTFFJECtaLU154z47L2TzNtn3G16UtUNvyLBA5b5HBKhKcjzwVHmRBreWz3urCF1obBT49mERb9mrsyicYjfoKqXS1mVVVCkvs1vAEm73RepXBHD37aQ4DVk9ThFB2RMiDxCwaW7EYUkNLpRaH1FHPJg2o9x1EkPsqcTg5TL31e3EctivtyLCVPLsaUsFYFmzyXCsniXeJPdPGxvt32fbeP1GUXv8N2xLAoVg815cuEnGvkjvztLK8Mv2fxtsPGQaEH6D9FEM2x1xRAFj6cspkbC5RpEbTcuEaaXBpBgVZSxT7TkYWUyerSYKLhocacwmGSYgduxvTB5w1nTfbk3sobEEjCrZwZjiQzdwkrP1iG4x1YDSB4f97n7gnbkEs5LDvuDwgS6KBeWnWTw1V2P5U8VkTCFhj6UAiv1FP9Tdi664MgDVNXQoEGQryy98zShcyg3BZ2Jr8yCdri3gVgMLG7b6Q91AXehz4RRs2X6SrZtCLKN2uBmhGwntvL2FvXDkGanXuRfUEMP8g2VdtWuW8",
 		PubKey:   "7ySHQR7YZJApfZRKds9hzzFypZo8s6WQyZqXCYVHRjug84TSqhdKgdVBhS3cZ6NYMfygyfPMvAgjnn2mp3c5dSME49opHiD3ioUaArqGqddyWf3gonWVfnjkTnMcdpGXvDt74uAYf2NrwsphN1MuBBX5NAoHtE5vTRMAiZL94KSg7qFNZM1PckSJfo4xJUD1JgmEMqBvavosjFoenhZv7FjLkXFJhHFGfF7KaK4Q62bUubYtgiR1bkYk1RtctkjUvnBW8YnSx1QFGrmA5qAz8ZUCRmeqgktvpYDR2bj3XFDUGmjqNG3N4QMikg2a6vquCuuT6kv5WefzUYncvijQLHx85z74F8wMZV5huUxQM3RS2aZgc89WvFjeP5Pkmv1bUqvdZ5n1Yi3U65b9KBCR9ycL",
 	},
+	ek1:
 	{
-		ElectionKey: "Dmfo6renA9YKuTFdGL4iSP5fcHbxHG4Qc9XTHkBzdHPa0QmVjm2QACdwMYguMtMooDoLsiagyVfe7qwxpuzUmX1stTM",
 		PrivKey:  "B9bLmHeKLQU1hX23meSn2kJP4wwPAGeaXRpYnkZyKfR98RYs51wo7syA9N7oSbcf49hyrp9vaFpo2GA9yYkiWsPh3smeDDbSZsuzNoAZXr4tjPFytaaddvbsbsme5YbdMejRh1qPncRR6vmhBwb9r4xZBugb2PZPNbqBKKkVotF3YzVzJ3s6kjKyTirGW8xowFbma8hwWntfaNVuZF143BeHQMjyAB5QYRtLtx85RS4Zkxm4wv71Y5ZAcf3VMgmjGXTVXivWX4pkDHBSYfXYr6CoqLy4iNNWstnehBVPAJFM9YvYTnoT3DYXyXXgBSnfPLXFgX9yxkKh8YtXVNKewLqa3b9uKHzCh1FbxTEThfTK1Q4YPFLEek8eR2DUHinGuPrEgCmH4H8ZKXmfLkmGTgHWDkzDr4u2e74jE7Fz9XWmwHq39ZzUsE5SFVWVm6domENEgQMPHU83X7RFXPwgfCCiNdNYkozL9hvBgPujDtiiyBPExbUqY5dnCceTuD6ysJmhwL4SHWpdHKZwwWETWeDTzyA7snZjbebcmE1visFydZ2UQaQdHKnNU5gV2NkiQupyyCEvs9rrHW6xf6g9myMrzdRQVRBBuKswCjq91CNA2uAtkyNLzEhD9GSLuGFRgmtzEwGxek2p12ysUjJyfgBDY28CoMJVJfeK8dyCHQnyvtmA32uxQ8m83QDRxTGY52ubsLaKm9n1L4MiJKW73BC8JoZxdQmuW8278JUAWdTK7KDk2yCDfFfUwGLq6Jz1aTqV5KM23Ysjto6ENeYSHiNrwJ4yBCP2cq4bs48dfdCqWodzBN2HaUpiFiPfQDG5r52zow1aULEaLeUrUbCChKTi6WqWyEBKxEpVMiL7dRQqzHyq3JAFyu51CgmbfFyQtamV8ULE4aVMotrCm2QcrvWxLxkjvSb4cCcnJwyQ9QyT8jFpfVnDWSdLSpbRAxJzr4c4pxWMDjhhPfQYWLArMTv7N6woQwMg8L6AJVbm96qQQ8v99VHVRzib4gVP36DYmTT8WEks2LtFXBwypU8x17iREvwex2ZXHQgvYRAkgw1uYg8rkGMQ5ZTrekTbbsBnUxmcV7Y5Cb18PUVeTRvDtFUB8K2VsZZeTnfWsfvKNqURs4nLyn4VPicgtUbDwLvJnpijDfodv6ydYfbdpDEtkGrKXKwNTwWZPFAts61Wnsouu7dLCN2gKWfhh8x4NdcnZP3fKE15GfLViFMeanAZvww2DVyW78cXpeztanCmkbUqLSvoGkRJsZ49pFEtVeGv1at6SFNKYzyPCWYnegfvs2f54rUKCchWDoNZwYw7fja32d87qEUzWouorLXc4ATkykaKzHthoiwEMjweQKGgGgUXbNbP56x1jZYgLPSCVHHgGaLNKgqW6tSXEKThEEg42kzDNiymr7soWwGrZPsNyE5vpfoxd7ebeKy2LJ4H9AwqAbUFhuFAFwzcTRLsiWGJKg9ysi8fpcGBcg7NbrrkHwsR1jvvpV7f855pRTPMXCUQpYiGWVPtJ1UZAsmX5RqVmgfdyJHYok8aL2XML9GeHTHZZNg7iD2ST8DSdKNhaYs7oxyTMvWsWnqPezUq5kaQxRa8zTkFqUJYUAgiZrKDFrgsXC4EgboyZM3CK",
 		PubKey:   "7ySHQR7YZJApfZRKds9hzzFypZo8s6WQyZqXCYVHRjug84TSqhdKDnnZpz69WtL8kvTgtrjEF3GHmsfjgMSt2t7vYgU26qHZfCXPUhA9u93vkCXSG6ZLBWw8K2HxMWPR69LoWzCsfXnLnw9mbr64uHmEeP64PSidtyshApUS73ikt7KGMdk3twJLr7SZ8uaqw6DCvBd9po5tVtPZ9gS1NPG3vuavLfm2P9YT2LMzCf68bJmqzgiVpUxRemvpwppVP675C5m6ctDELBTvqwQ9dc8baG4ztZPehEeUhULG5JpgtMKayCYRNhQVKdENyWXfFYzpMJ27iMH3LT2dixjgXRkqh8PKFt1srJA4we6vCLx1yjDjJV7MELo9P9nkXbojjQLXnqa41bYYGMN4ChK1C78U",
 	},
@@ -21,34 +26,38 @@ var elections = [2]ElectionConfig{
 
 func TestElectionConfigDecoding(t *testing.T) {
 	jsonStream := fmt.Sprintf(`
-	[{"ElectionKey": "%s",
-	  "PrivKey": "%s",
-	  "PubKey": "%s"},
-	 {"ElectionKey": "%s",
-	  "PrivKey": "%s",
-	  "PubKey": "%s"}]`,
-		elections[0].ElectionKey,
-		elections[0].PrivKey,
-		elections[0].PubKey,
-		elections[1].ElectionKey,
-		elections[1].PrivKey,
-		elections[1].PubKey,
+	{"%s": {"PrivKey": "%s",
+		"PubKey":  "%s"},
+	 "%s": {"PrivKey": "%s",
+		"PubKey":  "%s"}}`,
+		ek0,
+		elections[ek0].PrivKey,
+		elections[ek0].PubKey,
+		ek1,
+		elections[ek1].PrivKey,
+		elections[ek1].PubKey,
 	)
 	electionConfigs := decodeElections(strings.NewReader(jsonStream))
-	switch {
-	case len(electionConfigs) != 2:
-		t.Fail()
-	case electionConfigs[0].ElectionKey != elections[0].ElectionKey:
-		t.Fail()
-	case electionConfigs[0].PrivKey != elections[0].PrivKey:
-		t.Fail()
-	case electionConfigs[0].PubKey != elections[0].PubKey:
-		t.Fail()
-	case electionConfigs[1].ElectionKey != elections[1].ElectionKey:
-		t.Fail()
-	case electionConfigs[1].PrivKey != elections[1].PrivKey:
-		t.Fail()
-	case electionConfigs[1].PubKey != elections[1].PubKey:
-		t.Fail()
+
+	if len(electionConfigs) != 2 {
+		t.FailNow()
+	}
+	if _, exists := electionConfigs[ek0]; !exists {
+		t.FailNow()
+	}
+	if _, exists := electionConfigs[ek1]; !exists {
+		t.FailNow()
+	}
+	if electionConfigs[ek0].PrivKey != elections[ek0].PrivKey {
+		t.FailNow()
+	}
+	if electionConfigs[ek1].PrivKey != elections[ek1].PrivKey {
+		t.FailNow()
+	}
+	if electionConfigs[ek0].PubKey != elections[ek0].PubKey {
+		t.FailNow()
+	}
+	if electionConfigs[ek1].PubKey != elections[ek1].PubKey {
+		t.FailNow()
 	}
 }
-- 
2.38.4