From 7d6345a3f9126525a8b279638d3094242c5a9206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?colin=20axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Thu, 7 Jan 2021 14:05:34 +0100 Subject: [PATCH] ibc: add proto message to Header and Misbehaviour (#8278) * add proto message to Header and Misbehaviour * format --- x/ibc/core/exported/client.go | 4 ++++ x/ibc/light-clients/06-solomachine/types/header.go | 2 +- .../06-solomachine/types/misbehaviour_handle_test.go | 2 +- x/ibc/light-clients/07-tendermint/types/header.go | 2 +- x/ibc/light-clients/07-tendermint/types/misbehaviour.go | 4 +--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/x/ibc/core/exported/client.go b/x/ibc/core/exported/client.go index 610839fd7a..656a233b3a 100644 --- a/x/ibc/core/exported/client.go +++ b/x/ibc/core/exported/client.go @@ -178,6 +178,8 @@ type ConsensusState interface { // Misbehaviour defines counterparty misbehaviour for a specific consensus type type Misbehaviour interface { + proto.Message + ClientType() string GetClientID() string ValidateBasic() error @@ -188,6 +190,8 @@ type Misbehaviour interface { // Header is the consensus state update information type Header interface { + proto.Message + ClientType() string GetHeight() Height ValidateBasic() error diff --git a/x/ibc/light-clients/06-solomachine/types/header.go b/x/ibc/light-clients/06-solomachine/types/header.go index 60a9bfeeb7..f9c5f176fd 100644 --- a/x/ibc/light-clients/06-solomachine/types/header.go +++ b/x/ibc/light-clients/06-solomachine/types/header.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) -var _ exported.Header = Header{} +var _ exported.Header = &Header{} // ClientType defines that the Header is a Solo Machine. func (Header) ClientType() string { diff --git a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go index 89692c5c4d..97ce22a3ed 100644 --- a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go +++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go @@ -59,7 +59,7 @@ func (suite *SoloMachineTestSuite) TestCheckMisbehaviourAndUpdateState() { "invalid misbehaviour type", func() { clientState = solomachine.ClientState() - misbehaviour = ibctmtypes.Misbehaviour{} + misbehaviour = &ibctmtypes.Misbehaviour{} }, false, }, diff --git a/x/ibc/light-clients/07-tendermint/types/header.go b/x/ibc/light-clients/07-tendermint/types/header.go index b5829e5f96..0b9cfa1db1 100644 --- a/x/ibc/light-clients/07-tendermint/types/header.go +++ b/x/ibc/light-clients/07-tendermint/types/header.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) -var _ exported.Header = Header{} +var _ exported.Header = &Header{} // ConsensusState returns the updated consensus state associated with the header func (h Header) ConsensusState() *ConsensusState { diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go index 4e2fa9e81a..340130d29f 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go @@ -13,9 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) -var ( - _ exported.Misbehaviour = Misbehaviour{} -) +var _ exported.Misbehaviour = &Misbehaviour{} // NewMisbehaviour creates a new Misbehaviour instance. func NewMisbehaviour(clientID string, header1, header2 *Header) *Misbehaviour {