fix conflicts

primev · Apr 18, 2024 · 8eff895 · 8eff895
1 parent f831915
commit 8eff895
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/vm/contracts_with_ctx.go b/core/vm/contracts_with_ctx.go
@@ -2,14 +2,16 @@ package vm
 
 import (
 	"fmt"
+
+	"github.com/holiman/uint256"
+
 	"math/big"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/holiman/uint256"
 )
 
 // Wrapper type which allows PrecompiledContract to be used as PrecompiledContractWithCtx

diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go
@@ -19,6 +19,7 @@ package bls
 import (
 	"bytes"
 	"fmt"
+
 	"math/big"
 	"time"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ package bls @@
     import (
     	"bytes"
     	"fmt"
     	"math/big"
     	"time"
@@ Expand Down @@