Merge branch 'main' into dependabot/github_actions/docker/login-action-3

Author: puneet2019

app/export.go

@@ -1,10 +1,10 @@
 package app
 
 import (
-	storetypes "cosmossdk.io/store/types"
 	"fmt"
 	stdlog "log"
 
+	storetypes "cosmossdk.io/store/types"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"

interchaintest/helpers/gov.go

@@ -2,11 +2,11 @@ package helpers
 
 import (
 	"context"
-	"cosmossdk.io/math"
 	"encoding/json"
 	"fmt"
 	"testing"
 
+	"cosmossdk.io/math"
 	"github.com/cosmos/interchaintest/v10/chain/cosmos"
 	"github.com/stretchr/testify/require"
 )

interchaintest/liquidstake_stkxprt_pause_test.go

@@ -3,7 +3,6 @@ package interchaintest
 import (
 	"context"
 	"encoding/json"
-	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"strconv"
 	"testing"
 
@@ -12,14 +11,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"github.com/cosmos/interchaintest/v10"
 	"github.com/cosmos/interchaintest/v10/chain/cosmos"
 	"github.com/cosmos/interchaintest/v10/ibc"
 	"github.com/cosmos/interchaintest/v10/testutil"
+	"github.com/persistenceOne/persistenceCore/v17/interchaintest/helpers"
 	liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
 	"github.com/stretchr/testify/require"
-
-	"github.com/persistenceOne/persistenceCore/v17/interchaintest/helpers"
 )
 
 // TestPauseLiquidStakeStkXPRT runs the flow of liquid XPRT staking while pausing the module.

interchaintest/liquidstake_stkxprt_test.go

@@ -2,8 +2,11 @@ package interchaintest
 
 import (
 	"context"
-	"cosmossdk.io/math"
 	"encoding/json"
+	"strconv"
+	"testing"
+
+	"cosmossdk.io/math"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -16,8 +19,6 @@ import (
 	"github.com/persistenceOne/persistenceCore/v17/interchaintest/helpers"
 	liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
 	"github.com/stretchr/testify/require"
-	"strconv"
-	"testing"
 )
 
 // TestLiquidStakeStkXPRT runs the flow of liquid XPRT staking using

interchaintest/liquidstake_unstake_stkxprt_test.go

@@ -2,7 +2,6 @@ package interchaintest
 
 import (
 	"context"
-	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"strconv"
 	"testing"
 
@@ -11,13 +10,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"github.com/cosmos/interchaintest/v10"
 	"github.com/cosmos/interchaintest/v10/chain/cosmos"
 	"github.com/cosmos/interchaintest/v10/testutil"
+	"github.com/persistenceOne/persistenceCore/v17/interchaintest/helpers"
 	liquidstaketypes "github.com/persistenceOne/persistenceCore/v17/x/liquidstake/types"
 	"github.com/stretchr/testify/require"
-
-	"github.com/persistenceOne/persistenceCore/v17/interchaintest/helpers"
 )
 
 // TestLiquidStakeUnstakeStkXPRT runs the flow of stkXPRT unstaking.