fix test app import export

app/export.go

@@ -4,10 +4,12 @@ package app
 import (
 	"encoding/json"
 	"fmt"
+	"log"
+
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	"log"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"

app/simulation/app_determinism_test.go

@@ -5,13 +5,14 @@ package simulation
 import (
 	"encoding/json"
 	"fmt"
+	"math/rand"
+	"os"
+	"testing"
+
 	"github.com/cosmos/cosmos-sdk/server"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	"github.com/cosmos/ibc-go/v7/testing/simapp"
-	"math/rand"
-	"os"
-	"testing"
 
 	dbm "github.com/cometbft/cometbft-db"
 	"github.com/cometbft/cometbft/libs/log"

x/intertx/keeper/msg_submit_tx.go

@@ -52,9 +52,6 @@ func (k Keeper) SubmitTx(goCtx context.Context, msg *types.MsgSubmitTx) (*types.
 	// timeoutTimestamp set to max value with the unsigned bit shifted to satisfy hermes timestamp conversion.
 	// it is the responsibility of the auth module developer to ensure an appropriate timeout timestamp.
 	timeoutTimestamp := ctx.BlockTime().Add(time.Minute).UnixNano()
-	if timeoutTimestamp < 0 {
-		return nil, sdkerrors.ErrInvalidRequest.Wrap("timeout timestamp is negative")
-	}
 	_, err = k.icaControllerKeeper.SendTx(ctx, chanCap, msg.ConnectionId, portID, packetData, uint64(timeoutTimestamp))
 	if err != nil {
 		return nil, err

x/intertx/keeper/msg_submit_tx_test.go

@@ -53,11 +53,8 @@ func TestSubmitTx(t *testing.T) {
 	}
 	blockTime := time.Unix(35235, 30)
 	s.sdkCtx.WithBlockTime(blockTime)
-	timeOut := s.sdkCtx.BlockTime().Add(time.Minute).UnixNano()
-	// check safe cast to uint64 for timeOut
-	if timeOut < 0 {
-		t.Fatalf("timeout timestamp is negative")
-	}
+	timeOutBlock := s.sdkCtx.BlockTime().Add(time.Minute)
+	timeOut := timeOutBlock.UnixNano()
 
 	capability := &capabilitytypes.Capability{
 		Index: 32,