From 48c456dd9212a20983f7354aefd24ad3040380e9 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 27 Jul 2022 21:21:40 +0700 Subject: [PATCH] gofumpt to reduce total number of changes versus v5 (#1734) * build(deps): bump actions/setup-go from 2.1.5 to 2.2.0 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 2.1.5 to 2.2.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v2.1.5...v2.2.0) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * gofumpt to reduce total number of changes versus v5 * change IncentivizeAcknowledgement to declaration * ibc_middleware fix * Delete .gitpod.yml sorry about this! * gofumpt -w -l . Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cmd/build_test_matrix/main.go | 1 - cmd/build_test_matrix/main_test.go | 1 - e2e/fee_middleware_test.go | 6 ++---- modules/apps/29-fee/ibc_middleware.go | 5 ++--- modules/apps/29-fee/keeper/msg_server_test.go | 4 +--- modules/apps/transfer/keeper/grpc_query_test.go | 4 +--- modules/apps/transfer/keeper/migrations.go | 1 - modules/apps/transfer/keeper/migrations_test.go | 2 -- modules/core/02-client/keeper/grpc_query.go | 1 - modules/core/03-connection/keeper/handshake.go | 1 - 10 files changed, 6 insertions(+), 20 deletions(-) diff --git a/cmd/build_test_matrix/main.go b/cmd/build_test_matrix/main.go index c86324b31f8..33afb2b46bc 100644 --- a/cmd/build_test_matrix/main.go +++ b/cmd/build_test_matrix/main.go @@ -69,7 +69,6 @@ func getGithubActionMatrixForTests(e2eRootDirectory string) (GithubActionTestMat return nil }) - if err != nil { return GithubActionTestMatrix{}, err } diff --git a/cmd/build_test_matrix/main_test.go b/cmd/build_test_matrix/main_test.go index 47de4d981c2..8dd75b4e4c1 100644 --- a/cmd/build_test_matrix/main_test.go +++ b/cmd/build_test_matrix/main_test.go @@ -134,7 +134,6 @@ func assertGithubActionTestMatricesEqual(t *testing.T, expected, actual GithubAc } func goTestFileContents(suiteName, fnName1, fnName2 string) string { - replacedSuiteName := strings.ReplaceAll(`package foo func TestSuiteName(t *testing.T) { diff --git a/e2e/fee_middleware_test.go b/e2e/fee_middleware_test.go index e6207f5d729..d45d1abb620 100644 --- a/e2e/fee_middleware_test.go +++ b/e2e/fee_middleware_test.go @@ -31,7 +31,8 @@ type FeeMiddlewareTestSuite struct { // RegisterCounterPartyPayee broadcasts a MsgRegisterCounterpartyPayee message. func (s *FeeMiddlewareTestSuite) RegisterCounterPartyPayee(ctx context.Context, chain *cosmos.CosmosChain, - user broadcast.User, portID, channelID, relayerAddr, counterpartyPayeeAddr string) (sdk.TxResponse, error) { + user broadcast.User, portID, channelID, relayerAddr, counterpartyPayeeAddr string, +) (sdk.TxResponse, error) { msg := feetypes.NewMsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr) return s.BroadcastMessages(ctx, chain, user, msg) } @@ -43,7 +44,6 @@ func (s *FeeMiddlewareTestSuite) QueryCounterPartyPayee(ctx context.Context, cha ChannelId: channelID, Relayer: relayerAddress, }) - if err != nil { return "", err } @@ -372,7 +372,6 @@ func (s *FeeMiddlewareTestSuite) TestMsgPayPacketFee_SingleSender_TimesOut() { }) t.Run("pay packet fee", func(t *testing.T) { - packetId := channeltypes.NewPacketId(channelA.PortID, channelA.ChannelID, 1) packetFee := feetypes.NewPacketFee(testFee, chainAWallet.Bech32Address(chainA.Config().Bech32Prefix), nil) @@ -407,7 +406,6 @@ func (s *FeeMiddlewareTestSuite) TestMsgPayPacketFee_SingleSender_TimesOut() { expected := testvalues.StartingTokenAmount - chainBWalletAmount.Amount - testFee.Total().AmountOf(chainADenom).Int64() s.Require().Equal(expected, actualBalance) }) - }) t.Run("start relayer", func(t *testing.T) { diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go index df2caebca3c..8b5e5e2503e 100644 --- a/modules/apps/29-fee/ibc_middleware.go +++ b/modules/apps/29-fee/ibc_middleware.go @@ -247,9 +247,8 @@ func (im IBCMiddleware) OnAcknowledgementPacket( if !im.keeper.IsFeeEnabled(ctx, packet.SourcePort, packet.SourceChannel) { return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) } - - var ack = &types.IncentivizedAcknowledgement{} - if err := types.ModuleCdc.UnmarshalJSON(acknowledgement, ack); err != nil { + var ack types.IncentivizedAcknowledgement + if err := types.ModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { return sdkerrors.Wrapf(err, "cannot unmarshal ICS-29 incentivized packet acknowledgement: %v", ack) } diff --git a/modules/apps/29-fee/keeper/msg_server_test.go b/modules/apps/29-fee/keeper/msg_server_test.go index 5baa099a300..9915eee1dfb 100644 --- a/modules/apps/29-fee/keeper/msg_server_test.go +++ b/modules/apps/29-fee/keeper/msg_server_test.go @@ -11,9 +11,7 @@ import ( ) func (suite *KeeperTestSuite) TestRegisterPayee() { - var ( - msg *types.MsgRegisterPayee - ) + var msg *types.MsgRegisterPayee testCases := []struct { name string diff --git a/modules/apps/transfer/keeper/grpc_query_test.go b/modules/apps/transfer/keeper/grpc_query_test.go index 3b984aab69f..5a042444f0f 100644 --- a/modules/apps/transfer/keeper/grpc_query_test.go +++ b/modules/apps/transfer/keeper/grpc_query_test.go @@ -223,9 +223,7 @@ func (suite *KeeperTestSuite) TestQueryDenomHash() { } func (suite *KeeperTestSuite) TestEscrowAddress() { - var ( - req *types.QueryEscrowAddressRequest - ) + var req *types.QueryEscrowAddressRequest testCases := []struct { msg string diff --git a/modules/apps/transfer/keeper/migrations.go b/modules/apps/transfer/keeper/migrations.go index d90307694a4..0bd08cab2c2 100644 --- a/modules/apps/transfer/keeper/migrations.go +++ b/modules/apps/transfer/keeper/migrations.go @@ -20,7 +20,6 @@ func NewMigrator(keeper Keeper) Migrator { // MigrateTraces migrates the DenomTraces to the correct format, accounting for slashes in the BaseDenom. func (m Migrator) MigrateTraces(ctx sdk.Context) error { - // list of traces that must replace the old traces in store var newTraces []types.DenomTrace m.keeper.IterateDenomTraces(ctx, diff --git a/modules/apps/transfer/keeper/migrations_test.go b/modules/apps/transfer/keeper/migrations_test.go index 708d948ff88..71532a4a37c 100644 --- a/modules/apps/transfer/keeper/migrations_test.go +++ b/modules/apps/transfer/keeper/migrations_test.go @@ -8,13 +8,11 @@ import ( ) func (suite *KeeperTestSuite) TestMigratorMigrateTraces() { - testCases := []struct { msg string malleate func() expectedTraces transfertypes.Traces }{ - { "success: two slashes in base denom", func() { diff --git a/modules/core/02-client/keeper/grpc_query.go b/modules/core/02-client/keeper/grpc_query.go index 71e89ac98ff..2437f616edc 100644 --- a/modules/core/02-client/keeper/grpc_query.go +++ b/modules/core/02-client/keeper/grpc_query.go @@ -215,7 +215,6 @@ func (q Keeper) ConsensusStateHeights(c context.Context, req *types.QueryConsens consensusStateHeights = append(consensusStateHeights, height) return true, nil }) - if err != nil { return nil, err } diff --git a/modules/core/03-connection/keeper/handshake.go b/modules/core/03-connection/keeper/handshake.go index 2e3048f03ae..ce0db6a469b 100644 --- a/modules/core/03-connection/keeper/handshake.go +++ b/modules/core/03-connection/keeper/handshake.go @@ -71,7 +71,6 @@ func (k Keeper) ConnOpenTry( proofHeight exported.Height, // height at which relayer constructs proof of A storing connectionEnd in state consensusHeight exported.Height, // latest height of chain B which chain A has stored in its chain B client ) (string, error) { - // generate a new connection connectionID := k.GenerateConnectionIdentifier(ctx)