Skip to content

Commit

Permalink
fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@skosito
skosito committed Jan 5, 2025
1 parent 99eeed5 commit 4f2e139
Show file tree
Hide file tree
Showing 34 changed files with 101 additions and 138 deletions.
10 changes: 5 additions & 5 deletions app/ante/ante_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (

"github.com/ethereum/go-ethereum/core/types"
ethparams "github.com/ethereum/go-ethereum/params"
"github.com/evmos/ethermint/app"
"github.com/evmos/ethermint/app/ante"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
"github.com/evmos/ethermint/tests"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/app/ante"
"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
"github.com/zeta-chain/ethermint/tests"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"

amino "github.com/cosmos/cosmos-sdk/codec"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
Expand Down
12 changes: 6 additions & 6 deletions app/ante/eth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

storetypes "cosmossdk.io/store/types"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/evmos/ethermint/app/ante"
"github.com/evmos/ethermint/server/config"
"github.com/evmos/ethermint/tests"
ethermint "github.com/evmos/ethermint/types"
"github.com/evmos/ethermint/x/evm/statedb"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/app/ante"
"github.com/zeta-chain/ethermint/server/config"
"github.com/zeta-chain/ethermint/tests"
ethermint "github.com/zeta-chain/ethermint/types"
"github.com/zeta-chain/ethermint/x/evm/statedb"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
)

func (suite AnteTestSuite) TestNewEthAccountVerificationDecorator() {
Expand Down
18 changes: 9 additions & 9 deletions app/ante/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/evmos/ethermint/app"
"github.com/evmos/ethermint/ethereum/eip712"
"github.com/evmos/ethermint/testutil"
utiltx "github.com/evmos/ethermint/testutil/tx"
"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/ethereum/eip712"
"github.com/zeta-chain/ethermint/testutil"
utiltx "github.com/zeta-chain/ethermint/testutil/tx"

"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -48,11 +48,11 @@ import (
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
ante "github.com/evmos/ethermint/app/ante"
"github.com/evmos/ethermint/tests"
"github.com/evmos/ethermint/x/evm/statedb"
evmtypes "github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
ante "github.com/zeta-chain/ethermint/app/ante"
"github.com/zeta-chain/ethermint/tests"
"github.com/zeta-chain/ethermint/x/evm/statedb"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
)

type AnteTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/signer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
mempool "github.com/cosmos/cosmos-sdk/types/mempool"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
evmtypes "github.com/evmos/ethermint/x/evm/types"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
)

var _ mempool.SignerExtractionAdapter = EthSignerExtractionAdapter{}
Expand Down
4 changes: 2 additions & 2 deletions app/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/evmos/ethermint/encoding"
ethermint "github.com/evmos/ethermint/types"
"github.com/zeta-chain/ethermint/encoding"
ethermint "github.com/zeta-chain/ethermint/types"
)

type GenesisState map[string]json.RawMessage
Expand Down
20 changes: 10 additions & 10 deletions cmd/ethermintd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/tx"
txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"

"cosmossdk.io/store"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
clientcfg "github.com/cosmos/cosmos-sdk/client/config"
Expand All @@ -44,7 +45,6 @@ import (
servertypes "github.com/cosmos/cosmos-sdk/server/types"
"github.com/cosmos/cosmos-sdk/snapshots"
snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
"github.com/cosmos/cosmos-sdk/store"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/cosmos/cosmos-sdk/types/tx/signing"
Expand All @@ -55,15 +55,15 @@ import (
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
rosettaCmd "github.com/cosmos/rosetta/cmd"
"github.com/evmos/ethermint/app"
ethermintclient "github.com/evmos/ethermint/client"
"github.com/evmos/ethermint/client/debug"
"github.com/evmos/ethermint/crypto/hd"
"github.com/evmos/ethermint/ethereum/eip712"
"github.com/evmos/ethermint/server"
servercfg "github.com/evmos/ethermint/server/config"
srvflags "github.com/evmos/ethermint/server/flags"
ethermint "github.com/evmos/ethermint/types"
"github.com/zeta-chain/ethermint/app"
ethermintclient "github.com/zeta-chain/ethermint/client"
"github.com/zeta-chain/ethermint/client/debug"
"github.com/zeta-chain/ethermint/crypto/hd"
"github.com/zeta-chain/ethermint/ethereum/eip712"
"github.com/zeta-chain/ethermint/server"
servercfg "github.com/zeta-chain/ethermint/server/config"
srvflags "github.com/zeta-chain/ethermint/server/flags"
ethermint "github.com/zeta-chain/ethermint/types"
)

const EnvPrefix = "ETHERMINT"
Expand Down
4 changes: 2 additions & 2 deletions encoding/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/tx"
gogoproto "github.com/cosmos/gogoproto/proto"
"github.com/ethereum/go-ethereum/common"
enccodec "github.com/evmos/ethermint/encoding/codec"
ethermint "github.com/evmos/ethermint/types"
enccodec "github.com/zeta-chain/ethermint/encoding/codec"
ethermint "github.com/zeta-chain/ethermint/types"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"
)
Expand Down
5 changes: 0 additions & 5 deletions indexer/kv_indexer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/evmos/ethermint/app"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
"github.com/evmos/ethermint/indexer"
"github.com/evmos/ethermint/tests"
"github.com/evmos/ethermint/x/evm/types"
"github.com/stretchr/testify/require"
"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
Expand Down
16 changes: 8 additions & 8 deletions rpc/backend/backend_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import (
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/stretchr/testify/suite"

"github.com/evmos/ethermint/app"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
"github.com/evmos/ethermint/crypto/hd"
"github.com/evmos/ethermint/indexer"
"github.com/evmos/ethermint/rpc/backend/mocks"
rpctypes "github.com/evmos/ethermint/rpc/types"
"github.com/evmos/ethermint/tests"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
"github.com/zeta-chain/ethermint/crypto/hd"
"github.com/zeta-chain/ethermint/indexer"
"github.com/zeta-chain/ethermint/rpc/backend/mocks"
rpctypes "github.com/zeta-chain/ethermint/rpc/types"
"github.com/zeta-chain/ethermint/tests"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
)

type BackendTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions rpc/backend/chain_info_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

sdkmath "cosmossdk.io/math"
"github.com/evmos/ethermint/rpc/backend/mocks"
evmtypes "github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
"github.com/zeta-chain/ethermint/rpc/backend/mocks"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
)

func (suite *BackendTestSuite) TestBaseFee() {
Expand Down
1 change: 0 additions & 1 deletion store/cachekv/benchmark_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"cosmossdk.io/store/dbadapter"
dbm "github.com/cosmos/cosmos-db"
"github.com/evmos/ethermint/store/cachekv"
"github.com/stretchr/testify/require"
"github.com/zeta-chain/ethermint/store/cachekv"
)
Expand Down
2 changes: 1 addition & 1 deletion store/cachekv/store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"cosmossdk.io/store/tracekv"
"cosmossdk.io/store/types"
"github.com/evmos/ethermint/store/cachekv/internal"
"github.com/zeta-chain/ethermint/store/cachekv/internal"
)

// Store wraps an in-memory cache around an underlying types.KVStore.
Expand Down
2 changes: 1 addition & 1 deletion store/cachekv/store_bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
dbm "github.com/cosmos/cosmos-db"

"cosmossdk.io/store/dbadapter"
"github.com/evmos/ethermint/store/cachekv"
"github.com/zeta-chain/ethermint/store/cachekv"
)

var sink interface{}
Expand Down
2 changes: 1 addition & 1 deletion store/cachemulti/store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"cosmossdk.io/store/tracekv"
"cosmossdk.io/store/types"
"github.com/evmos/ethermint/store/cachekv"
"github.com/zeta-chain/ethermint/store/cachekv"
)

// storeNameCtxKey is the TraceContext metadata key that identifies
Expand Down
2 changes: 1 addition & 1 deletion tests/importer/importer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

sdkmath "cosmossdk.io/math"
"github.com/evmos/ethermint/app"
"github.com/zeta-chain/ethermint/app"

"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
8 changes: 4 additions & 4 deletions testutil/network/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ import (
"github.com/cosmos/cosmos-sdk/x/genutil"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/evmos/ethermint/crypto/hd"
"github.com/evmos/ethermint/server/config"
ethermint "github.com/evmos/ethermint/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/crypto/hd"
"github.com/zeta-chain/ethermint/server/config"
ethermint "github.com/zeta-chain/ethermint/types"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"

simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
"github.com/zeta-chain/ethermint/app"
Expand Down
6 changes: 3 additions & 3 deletions x/evm/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keyring"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/evmos/ethermint/app"
ethermint "github.com/evmos/ethermint/types"
"github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/app"
ethermint "github.com/zeta-chain/ethermint/types"
"github.com/zeta-chain/ethermint/x/evm/types"
)

type HandlerTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion x/evm/keeper/abci_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper_test

import (
evmtypes "github.com/evmos/ethermint/x/evm/types"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
)

func (suite *KeeperTestSuite) TestEndBlock() {
Expand Down
16 changes: 8 additions & 8 deletions x/evm/keeper/grpc_query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ import (
"github.com/ethereum/go-ethereum/crypto"
ethlogger "github.com/ethereum/go-ethereum/eth/tracers/logger"
ethparams "github.com/ethereum/go-ethereum/params"
"github.com/evmos/ethermint/app"
"github.com/evmos/ethermint/server/config"
"github.com/evmos/ethermint/tests"
"github.com/evmos/ethermint/testutil"
ethermint "github.com/evmos/ethermint/types"
"github.com/evmos/ethermint/x/evm/statedb"
"github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/server/config"
"github.com/zeta-chain/ethermint/tests"
"github.com/zeta-chain/ethermint/testutil"
ethermint "github.com/zeta-chain/ethermint/types"
"github.com/zeta-chain/ethermint/x/evm/statedb"
"github.com/zeta-chain/ethermint/x/evm/types"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
)

// Not valid Ethereum address
Expand Down
10 changes: 5 additions & 5 deletions x/evm/keeper/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/evmos/ethermint/app"
"github.com/evmos/ethermint/tests"
"github.com/evmos/ethermint/testutil"
"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/tests"
"github.com/zeta-chain/ethermint/testutil"

evmtypes "github.com/evmos/ethermint/x/evm/types"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
)

var _ = Describe("Feemarket", func() {
Expand Down
4 changes: 2 additions & 2 deletions x/evm/keeper/keeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/evmos/ethermint/testutil"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
"github.com/zeta-chain/ethermint/testutil"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"

"github.com/zeta-chain/ethermint/app"
"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
Expand Down
2 changes: 1 addition & 1 deletion x/evm/keeper/params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/x/evm/types"
)

// GetParams returns the total set of evm parameters.
Expand Down
9 changes: 5 additions & 4 deletions x/evm/keeper/state_transition.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ import (
"math/big"

cmttypes "github.com/cometbft/cometbft/types"
"github.com/holiman/uint256"

errorsmod "cosmossdk.io/errors"
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
ethermint "github.com/evmos/ethermint/types"
"github.com/evmos/ethermint/x/evm/statedb"
"github.com/evmos/ethermint/x/evm/types"
ethermint "github.com/zeta-chain/ethermint/types"
"github.com/zeta-chain/ethermint/x/evm/statedb"
"github.com/zeta-chain/ethermint/x/evm/types"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
Expand Down Expand Up @@ -441,7 +442,7 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context,

// calculate a minimum amount of gas to be charged to sender if GasLimit
// is considerably higher than GasUsed to stay more aligned with Tendermint gas mechanics
// for more info https://github.com/evmos/ethermint/issues/1085
// for more info https://github.com/zeta-chain/ethermint/issues/1085
gasLimit := sdkmath.LegacyNewDec(int64(msg.GasLimit))

Check failure

Code scanning / gosec

Potential integer overflow by integer type conversion Error

Potential integer overflow by integer type conversion
minGasMultiplier := cfg.FeeMarketParams.MinGasMultiplier
if minGasMultiplier.IsNil() {
Expand Down
14 changes: 8 additions & 6 deletions x/evm/keeper/statedb_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package keeper_test
import (
"fmt"
"math/big"
"testing"

"cosmossdk.io/store/prefix"
"github.com/cosmos/cosmos-sdk/client"
Expand All @@ -13,17 +14,18 @@ import (
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/holiman/uint256"
"github.com/stretchr/testify/suite"

"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto"
"github.com/evmos/ethermint/crypto/ethsecp256k1"
"github.com/evmos/ethermint/encoding"
"github.com/evmos/ethermint/tests"
"github.com/evmos/ethermint/testutil"
"github.com/evmos/ethermint/x/evm/statedb"
"github.com/evmos/ethermint/x/evm/types"
"github.com/zeta-chain/ethermint/crypto/ethsecp256k1"
"github.com/zeta-chain/ethermint/encoding"
"github.com/zeta-chain/ethermint/tests"
"github.com/zeta-chain/ethermint/testutil"
"github.com/zeta-chain/ethermint/x/evm/statedb"
"github.com/zeta-chain/ethermint/x/evm/types"
)

type StateDBTestSuite struct {
Expand Down
Loading

0 comments on commit 4f2e139

Please sign in to comment.