refactor: lift common code

weaveworks · Jul 20, 2015 · e294eac · e294eac
1 parent 29977a5
commit e294eac
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/router/protocol.go b/router/protocol.go
@@ -180,13 +180,13 @@ func (res *ProtocolIntroResults) doIntroV1(params ProtocolIntroParams, pubKey, p
 		return err
 	}
 
+	res.Sender = NewGobTCPSender(enc)
+	res.Receiver = NewGobTCPReceiver(dec)
+
 	if pubKey == nil {
 		if _, present := res.Features["PublicKey"]; present {
 			return ErrExpectedNoCrypto
 		}
-
-		res.Sender = NewGobTCPSender(enc)
-		res.Receiver = NewGobTCPReceiver(dec)
 	} else {
 		remotePubKeyStr, ok := res.Features["PublicKey"]
 		if !ok {
@@ -198,8 +198,6 @@ func (res *ProtocolIntroResults) doIntroV1(params ProtocolIntroParams, pubKey, p
 			return err
 		}
 
-		res.Sender = NewGobTCPSender(enc)
-		res.Receiver = NewGobTCPReceiver(dec)
 		res.setupCrypto(params, remotePubKey, privKey)
 	}