Merge pull request #49 from tendermint/pubKey-invalid-data-returns-empty-pubKey

PubKeyFromBytes: return zero value PubKey on error

pub_key.go

@@ -14,8 +14,10 @@ import (
 )
 
 func PubKeyFromBytes(pubKeyBytes []byte) (pubKey PubKey, err error) {
-	err = wire.ReadBinaryBytes(pubKeyBytes, &pubKey)
-	return
+	if err := wire.ReadBinaryBytes(pubKeyBytes, &pubKey); err != nil {
+		return PubKey{}, err
+	}
+	return pubKey, nil
 }
 
 //----------------------------------------

pub_key_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type keyData struct {
@@ -39,3 +40,9 @@ func TestPubKeySecp256k1Address(t *testing.T) {
 		assert.Equal(t, addr, addrB, "Expected addresses to match")
 	}
 }
+
+func TestPubKeyInvalidDataProperReturnsEmpty(t *testing.T) {
+	pk, err := PubKeyFromBytes([]byte("foo"))
+	require.NotNil(t, err, "expecting a non-nil error")
+	require.True(t, pk.Empty(), "expecting an empty public key on error")
+}