From fe7cdbd48053a554721707b90fd6b4568ded0b1b Mon Sep 17 00:00:00 2001 From: Dzmitry Hil Date: Thu, 9 Nov 2023 08:34:51 +0300 Subject: [PATCH] Fix merge conflicts --- integration-tests/modules/assetft_test.go | 3 ++- integration-tests/modules/wasm_test.go | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/integration-tests/modules/assetft_test.go b/integration-tests/modules/assetft_test.go index d01d4c392..9cade7b2b 100644 --- a/integration-tests/modules/assetft_test.go +++ b/integration-tests/modules/assetft_test.go @@ -5335,7 +5335,8 @@ func TestAssetFTMintingAndSendingOnBehalfOfIssuingSmartContractIsPossibleEvenIfS Sender: contractAddr, Recipient: recipient.String(), Coin: sdk.NewInt64Coin(denom, 100), - }}) + }, + }) chain.FundAccountWithOptions(ctx, t, grantee, integration.BalancesOptions{ Messages: []sdk.Msg{ diff --git a/integration-tests/modules/wasm_test.go b/integration-tests/modules/wasm_test.go index 698d4ea2b..0db9930ef 100644 --- a/integration-tests/modules/wasm_test.go +++ b/integration-tests/modules/wasm_test.go @@ -7,8 +7,6 @@ import ( _ "embed" "encoding/base64" "encoding/json" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "math/rand" "testing" "time" @@ -18,9 +16,11 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" cosmoserrors "github.com/cosmos/cosmos-sdk/types/errors" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" authztypes "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" nfttypes "github.com/cosmos/cosmos-sdk/x/nft" "github.com/samber/lo" @@ -352,7 +352,8 @@ func TestWASMPinningAndUnpinningSmartContractUsingGovernance(t *testing.T) { &wasmtypes.MsgPinCodes{ Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(), CodeIDs: []uint64{codeID}, - }}, + }, + }, "", "Pin smart contract", "Testing smart contract pinning", @@ -386,7 +387,8 @@ func TestWASMPinningAndUnpinningSmartContractUsingGovernance(t *testing.T) { &wasmtypes.MsgUnpinCodes{ Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(), CodeIDs: []uint64{codeID}, - }}, + }, + }, "", "Unpin smart contract", "Testing smart contract unpinning",