minimal linter fixes

gartnera · gartnera · commit 72da702c116f · 2024-10-24T10:50:38.000-07:00
diff --git a/ethereum/eip712/encoding_legacy.go b/ethereum/eip712/encoding_legacy.go
@@ -26,7 +26,6 @@ import (
 	txTypes "github.com/cosmos/cosmos-sdk/types/tx"
 
 	apitypes "github.com/ethereum/go-ethereum/signer/core/apitypes"
-	"github.com/zeta-chain/ethermint/types"
 	ethermint "github.com/zeta-chain/ethermint/types"
 )
 
@@ -109,7 +108,7 @@ func legacyDecodeAminoSignDoc(signDocBytes []byte) (apitypes.TypedData, error) {
 		FeePayer: feePayer,
 	}
 
-	chainID, err := types.ParseChainID(aminoDoc.ChainID)
+	chainID, err := ethermint.ParseChainID(aminoDoc.ChainID)
 	if err != nil {
 		return apitypes.TypedData{}, errors.New("invalid chain ID passed as argument")
 	}
diff --git a/server/json_rpc.go b/server/json_rpc.go
@@ -46,7 +46,7 @@ func (g *gethLogsToTm) Enabled(_ context.Context, _ slog.Level) bool {
 	return true
 }
 
-func (g *gethLogsToTm) Handle(ctx context.Context, record slog.Record) error {
+func (g *gethLogsToTm) Handle(_ context.Context, record slog.Record) error {
 	attrs := g.attrs
 	record.Attrs(func(attr slog.Attr) bool {
 		attrs = append(attrs, attr)
@@ -72,7 +72,7 @@ func (g *gethLogsToTm) WithAttrs(attrs []slog.Attr) slog.Handler {
 	}
 }
 
-func (g *gethLogsToTm) WithGroup(name string) slog.Handler {
+func (g *gethLogsToTm) WithGroup(_ string) slog.Handler {
 	return g
 }
 
diff --git a/tests/integration_tests/expected_constants.py b/tests/integration_tests/expected_constants.py
@@ -19,8 +19,8 @@
             "0xf90211a07e164dfd7f1ae0e9c7a5276c54f44dde92965a6c2f33a6ab70f15837e7334846a08d1f58f0b8113267e9ae0b00cc2814bafd7abdf64ef092da4022252723ec4009a08e4bd9b065fa8dab94bac469f47a04f2c6cd269c5345de50566a54ec34ef21dba0f9a8d5511d60abf59d66a80a252ea86e3f3b6c325eeac5d861fca7e16c4e4111a006ad844c311fe3730f814ed96a75dd268f609c30bd4476c7842d877cb2baa0aaa076e6eedf4846cb47b5343708159de812ab27f6ad350e68ed70a936bcad30401fa0aa867723f3f21a5eb867ed5c5b99609ea535b967f710e547945e3ec2a212c68fa09d3e7fd8cd22ab508d079b58b40f75c3242f7c7704a82ec1c573f682e2168824a0aba33ff032dc7e10fc3a228adbcff47480580b292c4afee754394c6017872d5ca0ec2cd81c2048e35a4bedee1b27e077129edab50a40972c0f6ccd25bd864bedf2a0371c03a000f78dff313551c7afbf52a1348127ab17b737732191dbd64e68b700a0df0aad31c4c0887c6109cadb0d2341a65f18bc35f6e5583ebd417853b9f56329a07c6437031b7543922a3e6a74ae237a844226db3f632a16dffbedd8679b03b018a0538592d2b6933ab7f0d276e7509151632fbca90c10079ee0c9cce87925b19abaa0d79a8e5a546626e60d5d5c7bb839612a42b5724e880deae4bc282f42496a1ef4a03d172648e5e01d32748c96362e197e37a13aeffa0ae213a23b8898e6508bb6a380",  # noqa: E501
             "0xf90211a07f77a654bce6a83ce5674a2936de6ea0768f4f11e19039c8b83ef62956d2ac15a0854518c708b71c9dfb97eaf4c300c0951108dc96ba9877e565cffced4224fbfca0d60083a3e2bdd537e16b3e2a6e62812fad9b7fbec0e56cb76676007fc1ac44eba0105b6a16896fc82d33f9c742890700b9a0312e37d15c7eb12dde2e015ce8920ea0f127c635dcde1f4898e8abcb45a1a8c07a32cc4d78f2f1fdc7386d26f41dc4aea06916ed562e2b84c6a4145a9a3c5716b5493db0637023347a883a3753522a57fea021b88faa7e7af0a40d03950f42abece8892452c3ce5d94266a36d444c8e84d73a0216e4a004f60aa058d227553b404ee93b5758f28d5bed24d6f3a34157b9a18bba0326b9ef2f85defffc61fc3561349969ff8aef23759ab4a4bd49b8dcd1453ee58a0649731f153d117e5ad56b07e3edfb911b3592009da413d952ff7fc2c1e0c8a25a077edfe281169e6425d0795670d9a33ea32ae11ee71896f9064d5a6189ed6693fa0f986846a0fff0ab469ae226de91e3f350757f49e21f48a57fc7c1e4142fa0c3aa0aae0a489f6e8142bce91638db238a1a2d32cc2c31d82eab86d20c89edca5ac3da04a789fc4610da58da2204e3c9f21e351b574b72c7a4194c996e2bc05d3086376a0184a75c2da01cbc27c48a0335318a60c9535ecd54a79bf96a9f821d8202a2080a0c22686c5baef46ef1364919c08a2cfe113cbc2ac0854d2a890df938538a5c36d80",  # noqa: E501
             "0xf90211a00b5b38caa0b8e500946e01b36441c04b3932af0af937866756aea01208e630e5a0347a4bd5d736dc5dd178c724de94ca9f3cf351d6cc697f547e115ac955c12762a0fc12087179e3debe3505a5da9cb133650322b5846644289211785ad3ec8c2400a001ef26f67f5ff67e0480d40e9822329c834f2683cc4973d11276c1d252c67d07a0dab8a89872ab8887433393a58c6838f56dd33598c17bc65b67b3975909a1d7d9a0d8e72a6583ec2542c5153d46ff671efcf0e86d3dd6594148be6c8f45b962372aa05d3dfc9d0271fa2e17f1af8a36a105755d7c8ffcd75b523bc9e508d1e4a7f9c5a0367b15490f03ee256758187c63bff678de58c716b94fcee3c68de9b88d4d6d8da0557dd25a49b199b78d194b2c418afcf654415b2db9354b9836490117ac9d768ea0a58e109994f8dccbc777bdf9af2b756c62a1102aba71513f3cbd9aab76fe5d99a034bfcb38403a1a9f3409ea13cb8139f820b702ee757cf87d229949825180a89ea0e3f8b04c275387c6222b6536967f2f1e6fc76dc6ee0e705d3e505f3d07e8bdd4a0deaf89533b13c20ff50ff3f03ff3a2daa8d1329a6a6d17a58c422cbe5ee2f80aa0d0754b6fa85d507289806f64b5ce973e4ded8ec2afb631c2ee13b007eba090cda0a762a467cda2fb000a163abbde837a5d22dc526c8101ad9f32d93dfde1c67765a0508c8133b154fa93189918d82e1048ee0e4094064ddbcee9cfbecf6867546c2380",  # noqa: E501
-            "0xf90151a000595129cf1c67ce97ed615df7184fb47a0d018d9147a2a7952a639e464cdfd380a052081f67d885b439bee62a1c4e09c02a1ec729aef4d92be6584a29141a79c5c7a0d99cae2bc3b6fc3e8e2767b4d7a5884b9b2d9d20da7890318beefcdb9c7346d58080a0f63571735d99e763dafadb03d1abe3a93a98740ecddc8514d13df46a35a8d94680a081870f4697e57436ccdd8bdc1d624d7bc07861748ff8b3a352334df68f2c03ada0f0252504ee8753335ecf0ca1f73cf13d4505783ed5110bf4e9b384a68ad88f69a0d38a18ef7b993c9ad2d848453e7722c26998ff3d63e243b99cdab0dabf84157ea06e5ad479dbda7f1647ed613e35d837f5d2c697ef34160f3665173186553ee9c280a0bf8371cac505b6ea0cb0f67ef744713f306a2455f3f8844cfa527c62db59c69980a0d6d689405b1cf73786c5fdabb55ec22f9b5712d1ba9c0bfcd46d4b93721fcac780",   # noqa: E501
-            "0xf8669d37f29e142d49f8824d4e7f1735ec3da219687387629b5fccd86812df84b846f8440180a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a01d93f60f105899172f7255c030301c3af4564edd4a48577dbdc448aec7ddb0ac",   # noqa: E501
+            "0xf90151a000595129cf1c67ce97ed615df7184fb47a0d018d9147a2a7952a639e464cdfd380a052081f67d885b439bee62a1c4e09c02a1ec729aef4d92be6584a29141a79c5c7a0d99cae2bc3b6fc3e8e2767b4d7a5884b9b2d9d20da7890318beefcdb9c7346d58080a0f63571735d99e763dafadb03d1abe3a93a98740ecddc8514d13df46a35a8d94680a081870f4697e57436ccdd8bdc1d624d7bc07861748ff8b3a352334df68f2c03ada0f0252504ee8753335ecf0ca1f73cf13d4505783ed5110bf4e9b384a68ad88f69a0d38a18ef7b993c9ad2d848453e7722c26998ff3d63e243b99cdab0dabf84157ea06e5ad479dbda7f1647ed613e35d837f5d2c697ef34160f3665173186553ee9c280a0bf8371cac505b6ea0cb0f67ef744713f306a2455f3f8844cfa527c62db59c69980a0d6d689405b1cf73786c5fdabb55ec22f9b5712d1ba9c0bfcd46d4b93721fcac780",  # noqa: E501
+            "0xf8669d37f29e142d49f8824d4e7f1735ec3da219687387629b5fccd86812df84b846f8440180a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a01d93f60f105899172f7255c030301c3af4564edd4a48577dbdc448aec7ddb0ac",  # noqa: E501
         ],
         "address": "0x7f0d15c7faae65896648c8273b6d7e43f58fa842",
         "balance": "0x0",
diff --git a/x/evm/statedb/journal.go b/x/evm/statedb/journal.go
@@ -223,14 +223,6 @@ func (ch transientStorageChange) Dirtied() *common.Address {
 	return nil
 }
 
-func (ch transientStorageChange) copy() JournalEntry {
-	return transientStorageChange{
-		account:  ch.account,
-		key:      ch.key,
-		prevalue: ch.prevalue,
-	}
-}
-
 func (ch addLogChange) Revert(s *StateDB) {
 	s.logs = s.logs[:len(s.logs)-1]
 }
diff --git a/x/evm/statedb/statedb.go b/x/evm/statedb/statedb.go
@@ -77,7 +77,6 @@ type StateDB struct {
 	accessList *accessList
 
 	// Transient storage
-	//nolint
 	transientStorage transientStorage
 
 	// events emitted by native action
@@ -95,7 +94,6 @@ func New(ctx sdk.Context, keeper Keeper, txConfig TxConfig) *StateDB {
 	return NewWithParams(ctx, keeper, txConfig, keeper.GetParams(ctx))
 }
 
-// nolint
 func NewWithParams(ctx sdk.Context, keeper Keeper, txConfig TxConfig, params evmtypes.Params) *StateDB {
 	db := &StateDB{
 		keeper:           keeper,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ import (`
`26`	`26`	`txTypes "github.com/cosmos/cosmos-sdk/types/tx"`
`27`	`27`
`28`	`28`	`apitypes "github.com/ethereum/go-ethereum/signer/core/apitypes"`
`29`		`- "github.com/zeta-chain/ethermint/types"`
`30`	`29`	`ethermint "github.com/zeta-chain/ethermint/types"`
`31`	`30`	`)`
`32`	`31`
`@@ -109,7 +108,7 @@ func legacyDecodeAminoSignDoc(signDocBytes []byte) (apitypes.TypedData, error) {`
`109`	`108`	`FeePayer: feePayer,`
`110`	`109`	`}`
`111`	`110`
`112`		`- chainID, err := types.ParseChainID(aminoDoc.ChainID)`
	`111`	`+ chainID, err := ethermint.ParseChainID(aminoDoc.ChainID)`
`113`	`112`	`if err != nil {`
`114`	`113`	`return apitypes.TypedData{}, errors.New("invalid chain ID passed as argument")`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (g *gethLogsToTm) Enabled(_ context.Context, _ slog.Level) bool {`
`46`	`46`	`return true`
`47`	`47`	`}`
`48`	`48`
`49`		`-func (g *gethLogsToTm) Handle(ctx context.Context, record slog.Record) error {`
	`49`	`+func (g *gethLogsToTm) Handle(_ context.Context, record slog.Record) error {`
`50`	`50`	`attrs := g.attrs`
`51`	`51`	`record.Attrs(func(attr slog.Attr) bool {`
`52`	`52`	`attrs = append(attrs, attr)`
`@@ -72,7 +72,7 @@ func (g *gethLogsToTm) WithAttrs(attrs []slog.Attr) slog.Handler {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-func (g *gethLogsToTm) WithGroup(name string) slog.Handler {`
	`75`	`+func (g *gethLogsToTm) WithGroup(_ string) slog.Handler {`
`76`	`76`	`return g`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -223,14 +223,6 @@ func (ch transientStorageChange) Dirtied() *common.Address {`
`223`	`223`	`return nil`
`224`	`224`	`}`
`225`	`225`
`226`		`-func (ch transientStorageChange) copy() JournalEntry {`
`227`		`- return transientStorageChange{`
`228`		`- account: ch.account,`
`229`		`- key: ch.key,`
`230`		`- prevalue: ch.prevalue,`
`231`		`- }`
`232`		`-}`
`233`		`-`
`234`	`226`	`func (ch addLogChange) Revert(s *StateDB) {`
`235`	`227`	`s.logs = s.logs[:len(s.logs)-1]`
`236`	`228`	`}`