From 28fb0f0ec89ab0a992b25473e8804dff72b7dc9c Mon Sep 17 00:00:00 2001 From: tbjump Date: Wed, 3 May 2023 22:26:44 +0000 Subject: [PATCH] node/adminserver: fix linter warnings --- node/cmd/guardiand/adminserver.go | 10 +++++++--- node/cmd/guardiand/adminserver_test.go | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/node/cmd/guardiand/adminserver.go b/node/cmd/guardiand/adminserver.go index e6a3348b5..4677bb49b 100644 --- a/node/cmd/guardiand/adminserver.go +++ b/node/cmd/guardiand/adminserver.go @@ -260,7 +260,7 @@ func wormchainStoreCode(req *nodev1.WormchainStoreCode, timestamp time.Time, gua // wormchainInstantiateContract converts a nodev1.WormchainInstantiateContract to its canonical VAA representation // Returns an error if the data is invalid -func wormchainInstantiateContract(req *nodev1.WormchainInstantiateContract, timestamp time.Time, guardianSetIndex uint32, nonce uint32, sequence uint64) (*vaa.VAA, error) { +func wormchainInstantiateContract(req *nodev1.WormchainInstantiateContract, timestamp time.Time, guardianSetIndex uint32, nonce uint32, sequence uint64) (*vaa.VAA, error) { //nolint:unparam // error is always nil but kept to mirror function signature of other functions instantiationParams_hash := vaa.CreateInstatiateCosmwasmContractHash(req.CodeId, req.Label, []byte(req.InstantiationMsg)) v := vaa.CreateGovernanceVAA(timestamp, nonce, sequence, guardianSetIndex, @@ -272,7 +272,7 @@ func wormchainInstantiateContract(req *nodev1.WormchainInstantiateContract, time } // wormchainMigrateContract converts a nodev1.WormchainMigrateContract to its canonical VAA representation -func wormchainMigrateContract(req *nodev1.WormchainMigrateContract, timestamp time.Time, guardianSetIndex uint32, nonce uint32, sequence uint64) (*vaa.VAA, error) { +func wormchainMigrateContract(req *nodev1.WormchainMigrateContract, timestamp time.Time, guardianSetIndex uint32, nonce uint32, sequence uint64) (*vaa.VAA, error) { //nolint:unparam // error is always nil but kept to mirror function signature of other functions instantiationParams_hash := vaa.CreateMigrateCosmwasmContractHash(req.CodeId, req.Contract, []byte(req.InstantiationMsg)) v := vaa.CreateGovernanceVAA(timestamp, nonce, sequence, guardianSetIndex, @@ -755,7 +755,11 @@ func (s *nodePrivilegedService) SignExistingVAA(ctx context.Context, req *nodev1 var gs *common.GuardianSet if cachedGs, exists := s.gsCache.Load(v.GuardianSetIndex); exists { - gs = cachedGs.(*common.GuardianSet) + var ok bool + gs, ok = cachedGs.(*common.GuardianSet) + if !ok { + return nil, fmt.Errorf("internal error") + } } else { evmGs, err := s.evmConnector.GetGuardianSet(ctx, v.GuardianSetIndex) if err != nil { diff --git a/node/cmd/guardiand/adminserver_test.go b/node/cmd/guardiand/adminserver_test.go index 2f3bfdd44..73dfd6c75 100644 --- a/node/cmd/guardiand/adminserver_test.go +++ b/node/cmd/guardiand/adminserver_test.go @@ -1,3 +1,4 @@ +//nolint:unparam package guardiand import (