From 40a49bf4072147293979451d8f8b1c50848deb81 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Wed, 12 Apr 2023 14:34:39 +0300 Subject: [PATCH] nit: Use nil pointer pattern to check for interface compliance. --- .../controller/ibc_middleware.go | 2 +- .../controller/keeper/grpc_query.go | 2 +- .../controller/keeper/msg_server.go | 2 +- .../controller/types/msgs.go | 2 +- .../host/keeper/grpc_query.go | 2 +- modules/apps/27-interchain-accounts/module.go | 8 +++--- modules/apps/29-fee/ibc_middleware.go | 2 +- modules/apps/29-fee/keeper/grpc_query.go | 2 +- modules/apps/29-fee/keeper/keeper.go | 4 +-- modules/apps/29-fee/keeper/msg_server.go | 2 +- modules/apps/29-fee/module.go | 4 +-- modules/apps/transfer/keeper/grpc_query.go | 2 +- modules/apps/transfer/keeper/msg_server.go | 2 +- modules/apps/transfer/module.go | 6 ++-- modules/apps/transfer/types/trace.go | 2 +- .../transfer/types/transfer_authorization.go | 2 +- modules/capability/module.go | 9 +++--- modules/core/02-client/keeper/grpc_query.go | 2 +- .../02-client/migrations/v7/solomachine.go | 4 +-- modules/core/02-client/types/client.go | 6 ++-- modules/core/02-client/types/genesis.go | 14 ++++------ modules/core/02-client/types/msgs.go | 16 +++++------ modules/core/02-client/types/proposal.go | 6 ++-- modules/core/02-client/types/query.go | 8 +++--- .../core/03-connection/keeper/grpc_query.go | 2 +- modules/core/03-connection/types/msgs.go | 12 ++++---- modules/core/03-connection/types/query.go | 4 +-- modules/core/03-connection/types/version.go | 2 +- modules/core/04-channel/keeper/keeper.go | 2 +- modules/core/04-channel/types/msgs.go | 28 ++++++++----------- modules/core/04-channel/types/query.go | 4 +-- modules/core/keeper/msg_server.go | 6 ++-- modules/core/module.go | 8 ++---- modules/core/types/genesis.go | 2 +- .../06-solomachine/consensus_state.go | 2 +- .../light-clients/06-solomachine/header.go | 2 +- .../06-solomachine/misbehaviour.go | 2 +- .../light-clients/06-solomachine/module.go | 2 +- .../06-solomachine/solomachine.go | 2 +- modules/light-clients/07-tendermint/header.go | 2 +- .../07-tendermint/misbehaviour.go | 2 +- modules/light-clients/07-tendermint/module.go | 2 +- 42 files changed, 93 insertions(+), 104 deletions(-) diff --git a/modules/apps/27-interchain-accounts/controller/ibc_middleware.go b/modules/apps/27-interchain-accounts/controller/ibc_middleware.go index 65becd1f624..fdc0627c033 100644 --- a/modules/apps/27-interchain-accounts/controller/ibc_middleware.go +++ b/modules/apps/27-interchain-accounts/controller/ibc_middleware.go @@ -16,7 +16,7 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ porttypes.Middleware = &IBCMiddleware{} +var _ porttypes.Middleware = (*IBCMiddleware)(nil) // IBCMiddleware implements the ICS26 callbacks for the fee middleware given the // ICA controller keeper and the underlying application. diff --git a/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go b/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go index a00b4854d59..764c8588af5 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) -var _ types.QueryServer = Keeper{} +var _ types.QueryServer = (*Keeper)(nil) // InterchainAccount implements the Query/InterchainAccount gRPC method func (k Keeper) InterchainAccount(goCtx context.Context, req *types.QueryInterchainAccountRequest) (*types.QueryInterchainAccountResponse, error) { diff --git a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go index 0495d0490b6..5d00462d292 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/msg_server.go @@ -10,7 +10,7 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ) -var _ types.MsgServer = msgServer{} +var _ types.MsgServer = (*msgServer)(nil) type msgServer struct { *Keeper diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs.go b/modules/apps/27-interchain-accounts/controller/types/msgs.go index 5837b76a01b..763b802f756 100644 --- a/modules/apps/27-interchain-accounts/controller/types/msgs.go +++ b/modules/apps/27-interchain-accounts/controller/types/msgs.go @@ -11,7 +11,7 @@ import ( host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) -var _ sdk.Msg = &MsgRegisterInterchainAccount{} +var _ sdk.Msg = (*MsgRegisterInterchainAccount)(nil) // NewMsgRegisterInterchainAccount creates a new instance of MsgRegisterInterchainAccount func NewMsgRegisterInterchainAccount(connectionID, owner, version string) *MsgRegisterInterchainAccount { diff --git a/modules/apps/27-interchain-accounts/host/keeper/grpc_query.go b/modules/apps/27-interchain-accounts/host/keeper/grpc_query.go index 8677c6b5754..0c09f58db14 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/grpc_query.go +++ b/modules/apps/27-interchain-accounts/host/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ) -var _ types.QueryServer = Keeper{} +var _ types.QueryServer = (*Keeper)(nil) // Params implements the Query/Params gRPC method func (q Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/modules/apps/27-interchain-accounts/module.go b/modules/apps/27-interchain-accounts/module.go index 98ef7d7ce42..3c737dd1c02 100644 --- a/modules/apps/27-interchain-accounts/module.go +++ b/modules/apps/27-interchain-accounts/module.go @@ -29,11 +29,11 @@ import ( ) var ( - _ module.AppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} - _ module.AppModuleSimulation = AppModule{} + _ module.AppModule = (*AppModule)(nil) + _ module.AppModuleBasic = (*AppModuleBasic)(nil) + _ module.AppModuleSimulation = (*AppModule)(nil) - _ porttypes.IBCModule = host.IBCModule{} + _ porttypes.IBCModule = (*host.IBCModule)(nil) ) // AppModuleBasic is the IBC interchain accounts AppModuleBasic diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go index 852bf9a002c..1938fd6381a 100644 --- a/modules/apps/29-fee/ibc_middleware.go +++ b/modules/apps/29-fee/ibc_middleware.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ porttypes.Middleware = &IBCMiddleware{} +var _ porttypes.Middleware = (*IBCMiddleware)(nil) // IBCMiddleware implements the ICS26 callbacks for the fee middleware given the // fee keeper and the underlying application. diff --git a/modules/apps/29-fee/keeper/grpc_query.go b/modules/apps/29-fee/keeper/grpc_query.go index 021459e864a..438abf8ae09 100644 --- a/modules/apps/29-fee/keeper/grpc_query.go +++ b/modules/apps/29-fee/keeper/grpc_query.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" ) -var _ types.QueryServer = Keeper{} +var _ types.QueryServer = (*Keeper)(nil) // IncentivizedPackets implements the Query/IncentivizedPackets gRPC method func (k Keeper) IncentivizedPackets(goCtx context.Context, req *types.QueryIncentivizedPacketsRequest) (*types.QueryIncentivizedPacketsResponse, error) { diff --git a/modules/apps/29-fee/keeper/keeper.go b/modules/apps/29-fee/keeper/keeper.go index a5764483602..99801bd6999 100644 --- a/modules/apps/29-fee/keeper/keeper.go +++ b/modules/apps/29-fee/keeper/keeper.go @@ -16,8 +16,8 @@ import ( // Middleware must implement types.ChannelKeeper and types.PortKeeper expected interfaces // so that it can wrap IBC channel and port logic for underlying application. var ( - _ types.ChannelKeeper = Keeper{} - _ types.PortKeeper = Keeper{} + _ types.ChannelKeeper = (*Keeper)(nil) + _ types.PortKeeper = (*Keeper)(nil) ) // Keeper defines the IBC fungible transfer keeper diff --git a/modules/apps/29-fee/keeper/msg_server.go b/modules/apps/29-fee/keeper/msg_server.go index 943ee0453fc..2bca7dc4a69 100644 --- a/modules/apps/29-fee/keeper/msg_server.go +++ b/modules/apps/29-fee/keeper/msg_server.go @@ -11,7 +11,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) -var _ types.MsgServer = Keeper{} +var _ types.MsgServer = (*Keeper)(nil) // RegisterPayee defines a rpc handler method for MsgRegisterPayee // RegisterPayee is called by the relayer on each channelEnd and allows them to set an optional diff --git a/modules/apps/29-fee/module.go b/modules/apps/29-fee/module.go index 9286e98cb9e..988276073e9 100644 --- a/modules/apps/29-fee/module.go +++ b/modules/apps/29-fee/module.go @@ -21,8 +21,8 @@ import ( ) var ( - _ module.AppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} + _ module.AppModule = (*AppModule)(nil) + _ module.AppModuleBasic = (*AppModuleBasic)(nil) ) // AppModuleBasic is the 29-fee AppModuleBasic diff --git a/modules/apps/transfer/keeper/grpc_query.go b/modules/apps/transfer/keeper/grpc_query.go index d6a1eaefdaa..e2fa2cc11d9 100644 --- a/modules/apps/transfer/keeper/grpc_query.go +++ b/modules/apps/transfer/keeper/grpc_query.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ) -var _ types.QueryServer = Keeper{} +var _ types.QueryServer = (*Keeper)(nil) // DenomTrace implements the Query/DenomTrace gRPC method func (q Keeper) DenomTrace(c context.Context, req *types.QueryDenomTraceRequest) (*types.QueryDenomTraceResponse, error) { diff --git a/modules/apps/transfer/keeper/msg_server.go b/modules/apps/transfer/keeper/msg_server.go index 8eb436ba6ec..e4de2338af0 100644 --- a/modules/apps/transfer/keeper/msg_server.go +++ b/modules/apps/transfer/keeper/msg_server.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ) -var _ types.MsgServer = Keeper{} +var _ types.MsgServer = (*Keeper)(nil) // Transfer defines an rpc handler method for MsgTransfer. func (k Keeper) Transfer(goCtx context.Context, msg *types.MsgTransfer) (*types.MsgTransferResponse, error) { diff --git a/modules/apps/transfer/module.go b/modules/apps/transfer/module.go index 657bb0ef402..34a88780c06 100644 --- a/modules/apps/transfer/module.go +++ b/modules/apps/transfer/module.go @@ -23,9 +23,9 @@ import ( ) var ( - _ module.AppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} - _ porttypes.IBCModule = IBCModule{} + _ module.AppModule = (*AppModule)(nil) + _ module.AppModuleBasic = (*AppModuleBasic)(nil) + _ porttypes.IBCModule = (*IBCModule)(nil) ) // AppModuleBasic is the IBC Transfer AppModuleBasic diff --git a/modules/apps/transfer/types/trace.go b/modules/apps/transfer/types/trace.go index b5ace22b3e7..81814fbdc6f 100644 --- a/modules/apps/transfer/types/trace.go +++ b/modules/apps/transfer/types/trace.go @@ -158,7 +158,7 @@ func (t Traces) Validate() error { return nil } -var _ sort.Interface = Traces{} +var _ sort.Interface = (*Traces)(nil) // Len implements sort.Interface for Traces func (t Traces) Len() int { return len(t) } diff --git a/modules/apps/transfer/types/transfer_authorization.go b/modules/apps/transfer/types/transfer_authorization.go index 709972afc49..959e341c7da 100644 --- a/modules/apps/transfer/types/transfer_authorization.go +++ b/modules/apps/transfer/types/transfer_authorization.go @@ -12,7 +12,7 @@ import ( const gasCostPerIteration = uint64(10) -var _ authz.Authorization = &TransferAuthorization{} +var _ authz.Authorization = (*TransferAuthorization)(nil) // NewTransferAuthorization creates a new TransferAuthorization object. func NewTransferAuthorization(allocations ...Allocation) *TransferAuthorization { diff --git a/modules/capability/module.go b/modules/capability/module.go index 6e2f06efa99..0dfc09e5875 100644 --- a/modules/capability/module.go +++ b/modules/capability/module.go @@ -26,9 +26,10 @@ import ( ) var ( - _ module.BeginBlockAppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} - _ module.AppModuleSimulation = AppModule{} + _ module.BeginBlockAppModule = (*AppModule)(nil) + _ module.AppModuleBasic = (*AppModuleBasic)(nil) + _ module.AppModuleSimulation = (*AppModule)(nil) + _ appmodule.AppModule = (*AppModule)(nil) ) // ---------------------------------------------------------------------------- @@ -100,8 +101,6 @@ func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, sealKeeper bool) AppMod } } -var _ appmodule.AppModule = AppModule{} - // IsOnePerModuleType implements the depinject.OnePerModuleType interface. func (am AppModule) IsOnePerModuleType() {} diff --git a/modules/core/02-client/keeper/grpc_query.go b/modules/core/02-client/keeper/grpc_query.go index 073f59b2995..de8484eb8b3 100644 --- a/modules/core/02-client/keeper/grpc_query.go +++ b/modules/core/02-client/keeper/grpc_query.go @@ -19,7 +19,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ types.QueryServer = Keeper{} +var _ types.QueryServer = (*Keeper)(nil) // ClientState implements the Query/ClientState gRPC method func (q Keeper) ClientState(c context.Context, req *types.QueryClientStateRequest) (*types.QueryClientStateResponse, error) { diff --git a/modules/core/02-client/migrations/v7/solomachine.go b/modules/core/02-client/migrations/v7/solomachine.go index 8996bae2e5f..02af8304feb 100644 --- a/modules/core/02-client/migrations/v7/solomachine.go +++ b/modules/core/02-client/migrations/v7/solomachine.go @@ -22,9 +22,9 @@ import ( // Interface implementation checks. var ( - _, _ codectypes.UnpackInterfacesMessage = &ClientState{}, &ConsensusState{} + _, _ codectypes.UnpackInterfacesMessage = (*ClientState)(nil), (*ConsensusState)(nil) _ exported.ClientState = (*ClientState)(nil) - _ exported.ConsensusState = &ConsensusState{} + _ exported.ConsensusState = (*ConsensusState)(nil) ) // RegisterInterfaces registers the solomachine v2 ClientState and ConsensusState types in the interface registry. diff --git a/modules/core/02-client/types/client.go b/modules/core/02-client/types/client.go index 86039dc5847..f572adf526a 100644 --- a/modules/core/02-client/types/client.go +++ b/modules/core/02-client/types/client.go @@ -15,8 +15,8 @@ import ( ) var ( - _ codectypes.UnpackInterfacesMessage = IdentifiedClientState{} - _ codectypes.UnpackInterfacesMessage = ConsensusStateWithHeight{} + _ codectypes.UnpackInterfacesMessage = (*IdentifiedClientState)(nil) + _ codectypes.UnpackInterfacesMessage = (*ConsensusStateWithHeight)(nil) ) // NewIdentifiedClientState creates a new IdentifiedClientState instance @@ -42,7 +42,7 @@ func (ics IdentifiedClientState) UnpackInterfaces(unpacker codectypes.AnyUnpacke return unpacker.UnpackAny(ics.ClientState, new(exported.ClientState)) } -var _ sort.Interface = IdentifiedClientStates{} +var _ sort.Interface = (*IdentifiedClientStates)(nil) // IdentifiedClientStates defines a slice of ClientConsensusStates that supports the sort interface type IdentifiedClientStates []IdentifiedClientState diff --git a/modules/core/02-client/types/genesis.go b/modules/core/02-client/types/genesis.go index f2ada0f55de..e5ed584ee75 100644 --- a/modules/core/02-client/types/genesis.go +++ b/modules/core/02-client/types/genesis.go @@ -11,15 +11,13 @@ import ( ) var ( - _ codectypes.UnpackInterfacesMessage = IdentifiedClientState{} - _ codectypes.UnpackInterfacesMessage = ClientsConsensusStates{} - _ codectypes.UnpackInterfacesMessage = ClientConsensusStates{} - _ codectypes.UnpackInterfacesMessage = GenesisState{} -) + _ codectypes.UnpackInterfacesMessage = (*IdentifiedClientState)(nil) + _ codectypes.UnpackInterfacesMessage = (*ClientsConsensusStates)(nil) + _ codectypes.UnpackInterfacesMessage = (*ClientConsensusStates)(nil) + _ codectypes.UnpackInterfacesMessage = (*GenesisState)(nil) -var ( - _ sort.Interface = ClientsConsensusStates{} - _ exported.GenesisMetadata = GenesisMetadata{} + _ sort.Interface = (*ClientsConsensusStates)(nil) + _ exported.GenesisMetadata = (*GenesisMetadata)(nil) ) // ClientsConsensusStates defines a slice of ClientConsensusStates that supports the sort interface diff --git a/modules/core/02-client/types/msgs.go b/modules/core/02-client/types/msgs.go index 9f2c76f4141..47b2e265a34 100644 --- a/modules/core/02-client/types/msgs.go +++ b/modules/core/02-client/types/msgs.go @@ -11,15 +11,15 @@ import ( ) var ( - _ sdk.Msg = &MsgCreateClient{} - _ sdk.Msg = &MsgUpdateClient{} - _ sdk.Msg = &MsgSubmitMisbehaviour{} - _ sdk.Msg = &MsgUpgradeClient{} + _ sdk.Msg = (*MsgCreateClient)(nil) + _ sdk.Msg = (*MsgUpdateClient)(nil) + _ sdk.Msg = (*MsgSubmitMisbehaviour)(nil) + _ sdk.Msg = (*MsgUpgradeClient)(nil) - _ codectypes.UnpackInterfacesMessage = MsgCreateClient{} - _ codectypes.UnpackInterfacesMessage = MsgUpdateClient{} - _ codectypes.UnpackInterfacesMessage = MsgSubmitMisbehaviour{} - _ codectypes.UnpackInterfacesMessage = MsgUpgradeClient{} + _ codectypes.UnpackInterfacesMessage = (*MsgCreateClient)(nil) + _ codectypes.UnpackInterfacesMessage = (*MsgUpdateClient)(nil) + _ codectypes.UnpackInterfacesMessage = (*MsgSubmitMisbehaviour)(nil) + _ codectypes.UnpackInterfacesMessage = (*MsgUpgradeClient)(nil) ) // NewMsgCreateClient creates a new MsgCreateClient instance diff --git a/modules/core/02-client/types/proposal.go b/modules/core/02-client/types/proposal.go index 2e6655d0ce9..0b22200242f 100644 --- a/modules/core/02-client/types/proposal.go +++ b/modules/core/02-client/types/proposal.go @@ -19,9 +19,9 @@ const ( ) var ( - _ govtypes.Content = &ClientUpdateProposal{} - _ govtypes.Content = &UpgradeProposal{} - _ codectypes.UnpackInterfacesMessage = &UpgradeProposal{} + _ govtypes.Content = (*ClientUpdateProposal)(nil) + _ govtypes.Content = (*UpgradeProposal)(nil) + _ codectypes.UnpackInterfacesMessage = (*UpgradeProposal)(nil) ) func init() { diff --git a/modules/core/02-client/types/query.go b/modules/core/02-client/types/query.go index 6bf1fb5c7ba..4d4ac0af9b7 100644 --- a/modules/core/02-client/types/query.go +++ b/modules/core/02-client/types/query.go @@ -7,10 +7,10 @@ import ( ) var ( - _ codectypes.UnpackInterfacesMessage = QueryClientStateResponse{} - _ codectypes.UnpackInterfacesMessage = QueryClientStatesResponse{} - _ codectypes.UnpackInterfacesMessage = QueryConsensusStateResponse{} - _ codectypes.UnpackInterfacesMessage = QueryConsensusStatesResponse{} + _ codectypes.UnpackInterfacesMessage = (*QueryClientStateResponse)(nil) + _ codectypes.UnpackInterfacesMessage = (*QueryClientStatesResponse)(nil) + _ codectypes.UnpackInterfacesMessage = (*QueryConsensusStateResponse)(nil) + _ codectypes.UnpackInterfacesMessage = (*QueryConsensusStatesResponse)(nil) ) // UnpackInterfaces implements UnpackInterfacesMesssage.UnpackInterfaces diff --git a/modules/core/03-connection/keeper/grpc_query.go b/modules/core/03-connection/keeper/grpc_query.go index c2a0afb2bf5..331ac3e500f 100644 --- a/modules/core/03-connection/keeper/grpc_query.go +++ b/modules/core/03-connection/keeper/grpc_query.go @@ -15,7 +15,7 @@ import ( host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) -var _ types.QueryServer = Keeper{} +var _ types.QueryServer = (*Keeper)(nil) // Connection implements the Query/Connection gRPC method func (q Keeper) Connection(c context.Context, req *types.QueryConnectionRequest) (*types.QueryConnectionResponse, error) { diff --git a/modules/core/03-connection/types/msgs.go b/modules/core/03-connection/types/msgs.go index b8a9d1e4e5d..ec2e39dcf8a 100644 --- a/modules/core/03-connection/types/msgs.go +++ b/modules/core/03-connection/types/msgs.go @@ -13,13 +13,13 @@ import ( ) var ( - _ sdk.Msg = &MsgConnectionOpenInit{} - _ sdk.Msg = &MsgConnectionOpenConfirm{} - _ sdk.Msg = &MsgConnectionOpenAck{} - _ sdk.Msg = &MsgConnectionOpenTry{} + _ sdk.Msg = (*MsgConnectionOpenInit)(nil) + _ sdk.Msg = (*MsgConnectionOpenConfirm)(nil) + _ sdk.Msg = (*MsgConnectionOpenAck)(nil) + _ sdk.Msg = (*MsgConnectionOpenTry)(nil) - _ codectypes.UnpackInterfacesMessage = MsgConnectionOpenTry{} - _ codectypes.UnpackInterfacesMessage = MsgConnectionOpenAck{} + _ codectypes.UnpackInterfacesMessage = (*MsgConnectionOpenTry)(nil) + _ codectypes.UnpackInterfacesMessage = (*MsgConnectionOpenAck)(nil) ) // NewMsgConnectionOpenInit creates a new MsgConnectionOpenInit instance. It sets the diff --git a/modules/core/03-connection/types/query.go b/modules/core/03-connection/types/query.go index a5277bee696..44983f9711c 100644 --- a/modules/core/03-connection/types/query.go +++ b/modules/core/03-connection/types/query.go @@ -8,8 +8,8 @@ import ( ) var ( - _ codectypes.UnpackInterfacesMessage = QueryConnectionClientStateResponse{} - _ codectypes.UnpackInterfacesMessage = QueryConnectionConsensusStateResponse{} + _ codectypes.UnpackInterfacesMessage = (*QueryConnectionClientStateResponse)(nil) + _ codectypes.UnpackInterfacesMessage = (*QueryConnectionConsensusStateResponse)(nil) ) // NewQueryConnectionResponse creates a new QueryConnectionResponse instance diff --git a/modules/core/03-connection/types/version.go b/modules/core/03-connection/types/version.go index f986236dc53..ba7874c8a2e 100644 --- a/modules/core/03-connection/types/version.go +++ b/modules/core/03-connection/types/version.go @@ -26,7 +26,7 @@ var ( } ) -var _ exported.Version = &Version{} +var _ exported.Version = (*Version)(nil) // NewVersion returns a new instance of Version. func NewVersion(identifier string, features []string) *Version { diff --git a/modules/core/04-channel/keeper/keeper.go b/modules/core/04-channel/keeper/keeper.go index 78aa622ca6b..d628abbed83 100644 --- a/modules/core/04-channel/keeper/keeper.go +++ b/modules/core/04-channel/keeper/keeper.go @@ -20,7 +20,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ porttypes.ICS4Wrapper = Keeper{} +var _ porttypes.ICS4Wrapper = (*Keeper)(nil) // Keeper defines the IBC channel keeper type Keeper struct { diff --git a/modules/core/04-channel/types/msgs.go b/modules/core/04-channel/types/msgs.go index eab7f00bba5..ccf378b696c 100644 --- a/modules/core/04-channel/types/msgs.go +++ b/modules/core/04-channel/types/msgs.go @@ -12,7 +12,17 @@ import ( host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) -var _ sdk.Msg = &MsgChannelOpenInit{} +var ( + _ sdk.Msg = (*MsgChannelOpenInit)(nil) + _ sdk.Msg = (*MsgChannelOpenTry)(nil) + _ sdk.Msg = (*MsgChannelOpenAck)(nil) + _ sdk.Msg = (*MsgChannelOpenConfirm)(nil) + _ sdk.Msg = (*MsgChannelCloseInit)(nil) + _ sdk.Msg = (*MsgChannelCloseConfirm)(nil) + _ sdk.Msg = (*MsgRecvPacket)(nil) + _ sdk.Msg = (*MsgAcknowledgement)(nil) + _ sdk.Msg = (*MsgTimeout)(nil) +) // NewMsgChannelOpenInit creates a new MsgChannelOpenInit. It sets the counterparty channel // identifier to be empty. @@ -61,8 +71,6 @@ func (msg MsgChannelOpenInit) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgChannelOpenTry{} - // NewMsgChannelOpenTry creates a new MsgChannelOpenTry instance // The version string is deprecated and will be ignored by core IBC. // It is left as an argument for go API backwards compatibility. @@ -123,8 +131,6 @@ func (msg MsgChannelOpenTry) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgChannelOpenAck{} - // NewMsgChannelOpenAck creates a new MsgChannelOpenAck instance // //nolint:interfacer @@ -173,8 +179,6 @@ func (msg MsgChannelOpenAck) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgChannelOpenConfirm{} - // NewMsgChannelOpenConfirm creates a new MsgChannelOpenConfirm instance // //nolint:interfacer @@ -218,8 +222,6 @@ func (msg MsgChannelOpenConfirm) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgChannelCloseInit{} - // NewMsgChannelCloseInit creates a new MsgChannelCloseInit instance // //nolint:interfacer @@ -257,8 +259,6 @@ func (msg MsgChannelCloseInit) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgChannelCloseConfirm{} - // NewMsgChannelCloseConfirm creates a new MsgChannelCloseConfirm instance // //nolint:interfacer @@ -302,8 +302,6 @@ func (msg MsgChannelCloseConfirm) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgRecvPacket{} - // NewMsgRecvPacket constructs new MsgRecvPacket // //nolint:interfacer @@ -347,8 +345,6 @@ func (msg MsgRecvPacket) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgTimeout{} - // NewMsgTimeout constructs new MsgTimeout // //nolint:interfacer @@ -434,8 +430,6 @@ func (msg MsgTimeoutOnClose) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{signer} } -var _ sdk.Msg = &MsgAcknowledgement{} - // NewMsgAcknowledgement constructs a new MsgAcknowledgement // //nolint:interfacer diff --git a/modules/core/04-channel/types/query.go b/modules/core/04-channel/types/query.go index 84c6fac61f2..543b1e8f6d6 100644 --- a/modules/core/04-channel/types/query.go +++ b/modules/core/04-channel/types/query.go @@ -8,8 +8,8 @@ import ( ) var ( - _ codectypes.UnpackInterfacesMessage = QueryChannelClientStateResponse{} - _ codectypes.UnpackInterfacesMessage = QueryChannelConsensusStateResponse{} + _ codectypes.UnpackInterfacesMessage = (*QueryChannelClientStateResponse)(nil) + _ codectypes.UnpackInterfacesMessage = (*QueryChannelConsensusStateResponse)(nil) ) // NewQueryChannelResponse creates a new QueryChannelResponse instance diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index a2c93c59c09..5c4edfbdd30 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -16,9 +16,9 @@ import ( ) var ( - _ clienttypes.MsgServer = Keeper{} - _ connectiontypes.MsgServer = Keeper{} - _ channeltypes.MsgServer = Keeper{} + _ clienttypes.MsgServer = (*Keeper)(nil) + _ connectiontypes.MsgServer = (*Keeper)(nil) + _ channeltypes.MsgServer = (*Keeper)(nil) ) // CreateClient defines a rpc handler method for MsgCreateClient. diff --git a/modules/core/module.go b/modules/core/module.go index 1ca99f17f6a..4eeb48e1a25 100644 --- a/modules/core/module.go +++ b/modules/core/module.go @@ -29,16 +29,14 @@ import ( ) var ( - _ module.AppModule = AppModule{} - _ module.AppModuleBasic = AppModuleBasic{} - _ module.AppModuleSimulation = AppModule{} + _ module.AppModule = (*AppModule)(nil) + _ module.AppModuleBasic = (*AppModuleBasic)(nil) + _ module.AppModuleSimulation = (*AppModule)(nil) ) // AppModuleBasic defines the basic application module used by the ibc module. type AppModuleBasic struct{} -var _ module.AppModuleBasic = AppModuleBasic{} - // Name returns the ibc module's name. func (AppModuleBasic) Name() string { return exported.ModuleName diff --git a/modules/core/types/genesis.go b/modules/core/types/genesis.go index bc14953cb0d..728269402b5 100644 --- a/modules/core/types/genesis.go +++ b/modules/core/types/genesis.go @@ -8,7 +8,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) -var _ codectypes.UnpackInterfacesMessage = GenesisState{} +var _ codectypes.UnpackInterfacesMessage = (*GenesisState)(nil) // DefaultGenesisState returns the ibc module's default genesis state. func DefaultGenesisState() *GenesisState { diff --git a/modules/light-clients/06-solomachine/consensus_state.go b/modules/light-clients/06-solomachine/consensus_state.go index ed3bfa55d37..8925ec3a5c2 100644 --- a/modules/light-clients/06-solomachine/consensus_state.go +++ b/modules/light-clients/06-solomachine/consensus_state.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ exported.ConsensusState = &ConsensusState{} +var _ exported.ConsensusState = (*ConsensusState)(nil) // ClientType returns Solo Machine type. func (ConsensusState) ClientType() string { diff --git a/modules/light-clients/06-solomachine/header.go b/modules/light-clients/06-solomachine/header.go index e9dd883f2fd..87d90dee48b 100644 --- a/modules/light-clients/06-solomachine/header.go +++ b/modules/light-clients/06-solomachine/header.go @@ -13,7 +13,7 @@ import ( // SentinelHeaderPath defines a placeholder path value used for headers in solomachine client updates const SentinelHeaderPath = "solomachine:header" -var _ exported.ClientMessage = &Header{} +var _ exported.ClientMessage = (*Header)(nil) // ClientType defines that the Header is a Solo Machine. func (Header) ClientType() string { diff --git a/modules/light-clients/06-solomachine/misbehaviour.go b/modules/light-clients/06-solomachine/misbehaviour.go index 8533f0b4fb3..fcfb8fdb277 100644 --- a/modules/light-clients/06-solomachine/misbehaviour.go +++ b/modules/light-clients/06-solomachine/misbehaviour.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ exported.ClientMessage = &Misbehaviour{} +var _ exported.ClientMessage = (*Misbehaviour)(nil) // ClientType is a Solo Machine light client. func (misbehaviour Misbehaviour) ClientType() string { diff --git a/modules/light-clients/06-solomachine/module.go b/modules/light-clients/06-solomachine/module.go index 3b168e0bcea..69c04e46f04 100644 --- a/modules/light-clients/06-solomachine/module.go +++ b/modules/light-clients/06-solomachine/module.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" ) -var _ module.AppModuleBasic = AppModuleBasic{} +var _ module.AppModuleBasic = (*AppModuleBasic)(nil) // AppModuleBasic defines the basic application module used by the solo machine light client. // Only the RegisterInterfaces function needs to be implemented. All other function perform diff --git a/modules/light-clients/06-solomachine/solomachine.go b/modules/light-clients/06-solomachine/solomachine.go index 41511910bf4..b68ee7062b2 100644 --- a/modules/light-clients/06-solomachine/solomachine.go +++ b/modules/light-clients/06-solomachine/solomachine.go @@ -6,7 +6,7 @@ import ( ) // Interface implementation checks. -var _, _, _, _ codectypes.UnpackInterfacesMessage = &ClientState{}, &ConsensusState{}, &Header{}, &HeaderData{} +var _, _, _, _ codectypes.UnpackInterfacesMessage = (*ClientState)(nil), (*ConsensusState)(nil), (*Header)(nil), (*HeaderData)(nil) // Data is an interface used for all the signature data bytes proto definitions. type Data interface{} diff --git a/modules/light-clients/07-tendermint/header.go b/modules/light-clients/07-tendermint/header.go index 73fcd7f8c11..8b0528a1f6c 100644 --- a/modules/light-clients/07-tendermint/header.go +++ b/modules/light-clients/07-tendermint/header.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ exported.ClientMessage = &Header{} +var _ exported.ClientMessage = (*Header)(nil) // ConsensusState returns the updated consensus state associated with the header func (h Header) ConsensusState() *ConsensusState { diff --git a/modules/light-clients/07-tendermint/misbehaviour.go b/modules/light-clients/07-tendermint/misbehaviour.go index 4162442c4f0..f81f5a01385 100644 --- a/modules/light-clients/07-tendermint/misbehaviour.go +++ b/modules/light-clients/07-tendermint/misbehaviour.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -var _ exported.ClientMessage = &Misbehaviour{} +var _ exported.ClientMessage = (*Misbehaviour)(nil) // FrozenHeight is same for all misbehaviour var FrozenHeight = clienttypes.NewHeight(0, 1) diff --git a/modules/light-clients/07-tendermint/module.go b/modules/light-clients/07-tendermint/module.go index c66bc36102d..e2201fc2876 100644 --- a/modules/light-clients/07-tendermint/module.go +++ b/modules/light-clients/07-tendermint/module.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" ) -var _ module.AppModuleBasic = AppModuleBasic{} +var _ module.AppModuleBasic = (*AppModuleBasic)(nil) // AppModuleBasic defines the basic application module used by the tendermint light client. // Only the RegisterInterfaces function needs to be implemented. All other function perform