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

M main.go
M master.go

@@ 27,7 27,7 @@ import (
 type ElectionOption string
 
 var (
-	Logger = log.Logger("tallyard")
+	logger = log.Logger("tallyard")
 	ProtocolID = protocol.ID("/tallyard/0.0.0")
 
 	electionOptions []ElectionOption


@@ 107,13 107,13 @@ func joinElection() {
 			if err != nil {
 				panic(err)
 			}
-			Logger.Info("merkle root:", merkleRoot)
+			logger.Info("merkle root:", merkleRoot)
 
 			masterID, err = peer.Decode(electionKey[zeroi+1:])
 			if err != nil {
 				panic(err)
 			}
-			Logger.Info("master ID:", masterID)
+			logger.Info("master ID:", masterID)
 		})
 	if err := app.SetRoot(form, true).EnableMouse(true).Run(); err != nil {
 		panic(err)


@@ 150,7 150,7 @@ func bootstrap() {
 			if err != nil {
 				return kdht, err
 			}
-			Logger.Info("boostrapping the DHT")
+			logger.Info("boostrapping the DHT")
 			if err = kdht.Bootstrap(ctx); err != nil {
 				panic(err)
 			}


@@ 161,8 161,8 @@ func bootstrap() {
 		panic(err)
 	}
 
-	Logger.Info("host:", h.ID())
-	Logger.Info(h.Addrs())
+	logger.Info("host:", h.ID())
+	logger.Info(h.Addrs())
 
 	var wg sync.WaitGroup
 	for _, peerAddr := range dht.DefaultBootstrapPeers {


@@ 171,9 171,9 @@ func bootstrap() {
 		go func() {
 			defer wg.Done()
 			if err := h.Connect(ctx, *peerInfo); err != nil {
-				Logger.Warning(err)
+				logger.Warning(err)
 			} else {
-				Logger.Info("connection established with bootstrap node:", *peerInfo)
+				logger.Info("connection established with bootstrap node:", *peerInfo)
 			}
 		}()
 	}


@@ 184,16 184,16 @@ func bootstrap() {
 		fmt.Printf("%s0%s\n",
 			base58.Encode(optionsMerkle.MerkleRoot()),
 			h.ID())
-		Logger.Info("waiting for incoming streams...")
+		logger.Info("waiting for incoming streams...")
 		h.SetStreamHandler(ProtocolID, masterStreamHandler)
 	} else { // we are a slave
-		Logger.Info("attempting to open stream with master peer...")
+		logger.Info("attempting to open stream with master peer...")
 		stream, err := h.NewStream(ctx, masterID, ProtocolID)
 		rw := bufio.NewReadWriter(bufio.NewReader(stream), bufio.NewWriter(stream))
 		if err != nil {
 			panic(err)
 		}
-		Logger.Info("opened stream with master peer")
+		logger.Info("opened stream with master peer")
 		_, err = rw.WriteString("options\n")
 		if err != nil {
 			panic(err)


@@ 213,7 213,7 @@ func bootstrap() {
 			fmt.Println(str)
 		}
 		stream.Close()
-		Logger.Info("stream with master peer closed")
+		logger.Info("stream with master peer closed")
 		checkMerkle()
 	}
 }

@@ 20,7 20,7 @@ func handleMasterCmd(cmd string, writer *bufio.Writer) {
 }
 
 func masterStreamHandler(stream network.Stream) {
-	Logger.Info("got a new stream!")
+	logger.Info("got a new stream!")
 	rw := bufio.NewReadWriter(bufio.NewReader(stream), bufio.NewWriter(stream))
 
 	cmd, err := rw.ReadString('\n')