core/vm: more linters (ethereum#24783)

XinFinOrg · Sep 25, 2024 · 22c26d8 · 22c26d8
1 parent c24172f
commit 22c26d8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -29,8 +29,6 @@ import (
  "github.com/XinFinOrg/XDPoSChain/crypto/blake2b"
  "github.com/XinFinOrg/XDPoSChain/crypto/bn256"
  "github.com/XinFinOrg/XDPoSChain/params"
-
- //lint:ignore SA1019 Needed for precompile
  "golang.org/x/crypto/ripemd160"
 )
 

diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go
@@ -230,35 +230,35 @@ func TestAddMod(t *testing.T) {
  }
 }
 
-// getResult is a convenience function to generate the expected values
-func getResult(args []*twoOperandParams, opFn executionFunc) []TwoOperandTestcase {
- var (
- env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
- stack = newstack()
- pc = uint64(0)
- interpreter = env.interpreter.(*EVMInterpreter)
- )
- result := make([]TwoOperandTestcase, len(args))
- for i, param := range args {
- x := new(uint256.Int).SetBytes(common.Hex2Bytes(param.x))
- y := new(uint256.Int).SetBytes(common.Hex2Bytes(param.y))
- stack.push(x)
- stack.push(y)
- _, err := opFn(&pc, interpreter, &ScopeContext{nil, stack, nil})
- if err != nil {
- log.Fatalln(err)
- }
- actual := stack.pop()
- result[i] = TwoOperandTestcase{param.x, param.y, fmt.Sprintf("%064x", actual)}
- }
- return result
-}
-
 // utility function to fill the json-file with testcases
 // Enable this test to generate the 'testcases_xx.json' files
 func TestWriteExpectedValues(t *testing.T) {
  t.Skip("Enable this test to create json test cases.")
 
+ // getResult is a convenience function to generate the expected values
+ getResult := func(args []*twoOperandParams, opFn executionFunc) []TwoOperandTestcase {
+ var (
+ env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
+ stack = newstack()
+ pc = uint64(0)
+ interpreter = env.interpreter.(*EVMInterpreter)
+ )
+ result := make([]TwoOperandTestcase, len(args))
+ for i, param := range args {
+ x := new(uint256.Int).SetBytes(common.Hex2Bytes(param.x))
+ y := new(uint256.Int).SetBytes(common.Hex2Bytes(param.y))
+ stack.push(x)
+ stack.push(y)
+ _, err := opFn(&pc, interpreter, &ScopeContext{nil, stack, nil})
+ if err != nil {
+ log.Fatalln(err)
+ }
+ actual := stack.pop()
+ result[i] = TwoOperandTestcase{param.x, param.y, fmt.Sprintf("%064x", actual)}
+ }
+ return result
+ }
+
  for name, method := range twoOpMethods {
  data, err := json.Marshal(getResult(commonParams, method))
  if err != nil {