Skip to content

Commit

Permalink
fix expect pointer error when unmarshalling misbehaviour file (#5020)
Browse files Browse the repository at this point in the history
* fix expect pointer error when unmarshalling misbehaviour file

* Update CHANGELOG.md

---------

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit 6c628f6)

# Conflicts:
#	CHANGELOG.md
  • Loading branch information
mmsqe authored and mergify[bot] committed Nov 6, 2023
1 parent 24a47ae commit 54bc60f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (testing) [\#4630](https://github.com/cosmos/ibc-go/pull/4630) Update `testconfig` to use revision formatted chain IDs.
* (core/04-channel) [\#4706](https://github.com/cosmos/ibc-go/pull/4706) Retrieve correct next send sequence for packets in unordered channels.
* (core/02-client) [\#4746](https://github.com/cosmos/ibc-go/pull/4746) Register implementations against `govtypes.Content` interface.
<<<<<<< HEAD
* (apps/27-interchain-accounts) [\#4944](https://github.com/cosmos/ibc-go/pull/4944) Add missing proto interface registration.
=======
* (core/02-client) [\#5020](https://github.com/cosmos/ibc-go/pull/5020) Fix expect pointer error when unmarshalling misbehaviour file.
>>>>>>> 6c628f6f (fix expect pointer error when unmarshalling misbehaviour file (#5020))
### Documentation

Expand Down
2 changes: 1 addition & 1 deletion modules/core/02-client/client/cli/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func newSubmitMisbehaviourCmd() *cobra.Command {
return fmt.Errorf("neither JSON input nor path to .json file for misbehaviour were provided: %w", err)
}

if err := cdc.UnmarshalInterfaceJSON(contents, misbehaviour); err != nil {
if err := cdc.UnmarshalInterfaceJSON(contents, &misbehaviour); err != nil {
return fmt.Errorf("error unmarshalling misbehaviour file: %w", err)
}
}
Expand Down

0 comments on commit 54bc60f

Please sign in to comment.