Cleanup

lib/connection_controller.go

@@ -94,7 +94,7 @@ func (cc *ConnectionController) initiatePersistentConnections() {
 		// are persistent in the sense that if we disconnect from one, we will
 		// try to reconnect to the same one.
 		for _, connectIp := range cc.connectIps {
-			if err := cc.createPersistentOutboundConnection(connectIp); err != nil {
+			if err := cc.CreateNonValidatorPersistentOutboundConnection(connectIp); err != nil {
 				glog.Errorf("ConnectionController.initiatePersistentConnections: Problem connecting "+
 					"to connectIp %v: %v", connectIp, err)
 			}
@@ -254,8 +254,13 @@ func (cc *ConnectionController) connectValidators(activeValidatorsMap map[bls.Se
 		_, exists := cc.rnManager.GetValidatorIndex().Get(pk)
 		if !exists {
 			// FIXME: for now we'll only use the first address in the ValidatorEntry
+			publicKey, err := pk.Deserialize()
+			if err != nil {
+				continue
+			}
+
 			address := string(validator.Domains[0])
-			if err := cc.createValidatorConnection(address, pk); err != nil {
+			if err := cc.CreateValidatorConnection(address, publicKey); err != nil {
 				// TODO: Do we want to log an error here?
 				continue
 			}