Skip to content

Commit

Permalink
Catch up with amino 0.13.0 (#2690)
Browse files Browse the repository at this point in the history
* catch up with amino changes in
tendermint/go-amino#222

* WIP: update to amino v0.13.0

* update to fixed amino release
  • Loading branch information
liamsi authored and ebuchman committed Oct 25, 2018
1 parent d394042 commit 3d8a26d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crypto/merkle/proof_simple_value.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ func SimpleValueOpDecoder(pop ProofOp) (ProofOperator, error) {
return nil, cmn.NewError("unexpected ProofOp.Type; got %v, want %v", pop.Type, ProofOpSimpleValue)
}
var op SimpleValueOp // a bit strange as we'll discard this, but it works.
err := cdc.UnmarshalBinary(pop.Data, &op)
err := cdc.UnmarshalBinaryLengthPrefixed(pop.Data, &op)
if err != nil {
return nil, cmn.ErrorWrap(err, "decoding ProofOp.Data into SimpleValueOp")
}
return NewSimpleValueOp(pop.Key, op.Proof), nil
}

func (op SimpleValueOp) ProofOp() ProofOp {
bz := cdc.MustMarshalBinary(op)
bz := cdc.MustMarshalBinaryLengthPrefixed(op)
return ProofOp{
Type: ProofOpSimpleValue,
Key: op.key,
Expand Down

0 comments on commit 3d8a26d

Please sign in to comment.