(Squash this) switch to bare

This commit is contained in:
ValarDragon 2018-08-10 13:42:23 -05:00
parent 4cf1dbd676
commit 8d28344e84
2 changed files with 2 additions and 2 deletions

View File

@ -65,7 +65,7 @@ func (pk *ThresholdMultiSignaturePubKey) VerifyBytes(msg []byte, marshalledSig [
// Bytes returns the amino encoded version of the ThresholdMultiSignaturePubKey
func (pk *ThresholdMultiSignaturePubKey) Bytes() []byte {
return cdc.MustMarshalBinary(pk)
return cdc.MustMarshalBinaryBare(pk)
}
// Address returns tmhash(ThresholdMultiSignaturePubKey.Bytes())

View File

@ -83,7 +83,7 @@ func TestMultiSigPubkeyEquality(t *testing.T) {
pubkeys, _ := generatePubKeysAndSignatures(5, msg)
multisigKey := NewThresholdMultiSignaturePubKey(2, pubkeys)
var unmarshalledMultisig *ThresholdMultiSignaturePubKey
cdc.MustUnmarshalBinary(multisigKey.Bytes(), &unmarshalledMultisig)
cdc.MustUnmarshalBinaryBare(multisigKey.Bytes(), &unmarshalledMultisig)
require.True(t, multisigKey.Equals(unmarshalledMultisig))
// Ensure that reordering pubkeys is treated as a different pubkey