Fix merge conflicts

CoreumFoundation · Nov 9, 2023 · fe7cdbd · fe7cdbd
1 parent b2394ab
commit fe7cdbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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",