(Squash this) switch to bare

crypto/multisig/threshold_multisig.go

@@ -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())

crypto/multisig/threshold_multisig_test.go

@@ -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