Complete merge (gofmt)

network/follow.go

@@ -24,12 +24,12 @@ package network
 import (
 	"gitlab.com/elixxir/client/network/gateway"
 	//"gitlab.com/elixxir/client/storage"
+	jww "github.com/spf13/jwalterweatherman"
+	bloom "gitlab.com/elixxir/bloomfilter"
+	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/primitives/knownRounds"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/crypto/csprng"
-	bloom "gitlab.com/elixxir/bloomfilter"
-	jww "github.com/spf13/jwalterweatherman"
-	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
 )
@@ -106,7 +106,6 @@ func (m *manager) follow(rng csprng.Source, comms followNetworkComms) {
 		filterList = append(filterList, filter)
 	}
 
-
 	// ---- Node Events ----
 	// NOTE: this updates the structure, AND sends events over the node
 	//       update channels about new and removed nodes

network/rounds/check.go

@@ -3,8 +3,8 @@ package rounds
 import (
 	"encoding/binary"
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/xx_network/primitives/id"
 	bloom "gitlab.com/elixxir/bloomfilter"
+	"gitlab.com/xx_network/primitives/id"
 )
 
 // the round checker is a single use function which is meant to be wrapped