Update to patched go-p2p, tendermint, fix a few tests

2017-04-27 15:53:49 +02:00
parent 0665a2e8a6
commit 787cf0ebac
4 changed files with 10 additions and 9 deletions
@@ -75,13 +75,14 @@ func (k *Key) Sign(msg []byte) crypto.Signature {
 // Generates a new validator with private key.
 func genKey() *Key {
 	privKey := crypto.GenPrivKeyEd25519()
-	addrBytes := privKey.PubKey().Address()
+	pubKey := privKey.PubKey()
+	addrBytes := pubKey.Address()
 	var addr Address
 	copy(addr[:], addrBytes)
 	return &Key{
 		Address: addr,
-		PubKey:  crypto.PubKeyS{privKey.PubKey()},
-		PrivKey: crypto.PrivKeyS{privKey},
+		PubKey:  pubKey,
+		PrivKey: privKey.Wrap(),
 	}
 }