From 8014fd1a8ebe2f7292a65fc5a08a53f703e024c7 Mon Sep 17 00:00:00 2001
From: Igor Mandrigin <i@mandrigin.ru>
Date: Mon, 15 Mar 2021 17:19:45 +0100
Subject: [PATCH] remove mentions of go-ethereum
---
graphql/graphql_test.go | 8 +-
les/state_accessor.go | 88 -------------------
oss-fuzz.sh | 2 +-
tests/fuzzers/bitutil/compress_fuzz.go | 2 +-
tests/fuzzers/bls12381/bls_fuzzer.go | 4 +-
tests/fuzzers/difficulty/debug/main.go | 2 +-
tests/fuzzers/difficulty/difficulty-fuzz.go | 4 +-
tests/fuzzers/les/debug/main.go | 2 +-
tests/fuzzers/les/les-fuzzer.go | 22 ++---
tests/fuzzers/rangeproof/debug/main.go | 2 +-
tests/fuzzers/rangeproof/rangeproof-fuzzer.go | 6 +-
tests/fuzzers/runtime/runtime_fuzz.go | 2 +-
tests/state_test_util.go | 36 ++++----
13 files changed, 45 insertions(+), 135 deletions(-)
delete mode 100644 les/state_accessor.go
diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go
index 41f30dcc77..85e8046d1f 100644
--- a/graphql/graphql_test.go
+++ b/graphql/graphql_test.go
@@ -26,11 +26,11 @@ import (
"time"
"github.com/ledgerwatch/turbo-geth/eth"
- "github.com/ethereum/go-ethereum/consensus/ethash"
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/ethconfig"
+ "github.com/ledgerwatch/turbo-geth/consensus/ethash"
+ "github.com/ledgerwatch/turbo-geth/core"
+ "github.com/ledgerwatch/turbo-geth/ethconfig"
"github.com/ledgerwatch/turbo-geth/node"
- "github.com/ethereum/go-ethereum/params"
+ "github.com/ledgerwatch/turbo-geth/params"
"github.com/stretchr/testify/assert"
)
diff --git a/les/state_accessor.go b/les/state_accessor.go
deleted file mode 100644
index 3c9143c875..0000000000
--- a/les/state_accessor.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2021 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package les
-
-import (
- "context"
- "errors"
- "fmt"
-
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/core/state"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/core/vm"
- "github.com/ethereum/go-ethereum/light"
-)
-
-// stateAtBlock retrieves the state database associated with a certain block.
-func (leth *LightEthereum) stateAtBlock(ctx context.Context, block *types.Block, reexec uint64) (*state.StateDB, func(), error) {
- return light.NewState(ctx, block.Header(), leth.odr), func() {}, nil
-}
-
-// statesInRange retrieves a batch of state databases associated with the specific
-// block ranges.
-func (leth *LightEthereum) statesInRange(ctx context.Context, fromBlock *types.Block, toBlock *types.Block, reexec uint64) ([]*state.StateDB, func(), error) {
- var states []*state.StateDB
- for number := fromBlock.NumberU64(); number <= toBlock.NumberU64(); number++ {
- header, err := leth.blockchain.GetHeaderByNumberOdr(ctx, number)
- if err != nil {
- return nil, nil, err
- }
- states = append(states, light.NewState(ctx, header, leth.odr))
- }
- return states, nil, nil
-}
-
-// stateAtTransaction returns the execution environment of a certain transaction.
-func (leth *LightEthereum) stateAtTransaction(ctx context.Context, block *types.Block, txIndex int, reexec uint64) (core.Message, vm.BlockContext, *state.StateDB, func(), error) {
- // Short circuit if it's genesis block.
- if block.NumberU64() == 0 {
- return nil, vm.BlockContext{}, nil, nil, errors.New("no transaction in genesis")
- }
- // Create the parent state database
- parent, err := leth.blockchain.GetBlock(ctx, block.ParentHash(), block.NumberU64()-1)
- if err != nil {
- return nil, vm.BlockContext{}, nil, nil, err
- }
- statedb, _, err := leth.stateAtBlock(ctx, parent, reexec)
- if err != nil {
- return nil, vm.BlockContext{}, nil, nil, err
- }
- if txIndex == 0 && len(block.Transactions()) == 0 {
- return nil, vm.BlockContext{}, statedb, func() {}, nil
- }
- // Recompute transactions up to the target index.
- signer := types.MakeSigner(leth.blockchain.Config(), block.Number())
- for idx, tx := range block.Transactions() {
- // Assemble the transaction call message and return if the requested offset
- msg, _ := tx.AsMessage(signer)
- txContext := core.NewEVMTxContext(msg)
- context := core.NewEVMBlockContext(block.Header(), leth.blockchain, nil)
- if idx == txIndex {
- return msg, context, statedb, func() {}, nil
- }
- // Not yet the searched for transaction, execute on top of the current state
- vmenv := vm.NewEVM(context, txContext, statedb, leth.blockchain.Config(), vm.Config{})
- if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.Gas())); err != nil {
- return nil, vm.BlockContext{}, nil, nil, fmt.Errorf("transaction %#x failed: %v", tx.Hash(), err)
- }
- // Ensure any modifications are committed to the state
- // Only delete empty objects if EIP158/161 (a.k.a Spurious Dragon) is in effect
- statedb.Finalise(vmenv.ChainConfig().IsEIP158(block.Number()))
- }
- return nil, vm.BlockContext{}, nil, nil, fmt.Errorf("transaction index %d out of range for block %#x", txIndex, block.Hash())
-}
diff --git a/oss-fuzz.sh b/oss-fuzz.sh
index ac93a5a467..da88ab3d00 100644
--- a/oss-fuzz.sh
+++ b/oss-fuzz.sh
@@ -27,7 +27,7 @@
# $LIB_FUZZING_ENGINE C++ compiler argument to link fuzz target against the prebuilt engine library (e.g. libFuzzer).
# This sets the -coverpgk for the coverage report when the corpus is executed through go test
-coverpkg="github.com/ethereum/go-ethereum/..."
+coverpkg="github.com/ledgerwatch/turbo-geth/..."
function coverbuild {
path=$1
diff --git a/tests/fuzzers/bitutil/compress_fuzz.go b/tests/fuzzers/bitutil/compress_fuzz.go
index 5903cf2f93..d8b087a55b 100644
--- a/tests/fuzzers/bitutil/compress_fuzz.go
+++ b/tests/fuzzers/bitutil/compress_fuzz.go
@@ -19,7 +19,7 @@ package bitutil
import (
"bytes"
- "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ledgerwatch/turbo-geth/common/bitutil"
)
// Fuzz implements a go-fuzz fuzzer method to test various encoding method
diff --git a/tests/fuzzers/bls12381/bls_fuzzer.go b/tests/fuzzers/bls12381/bls_fuzzer.go
index bc3c456526..6a7aaa47ca 100644
--- a/tests/fuzzers/bls12381/bls_fuzzer.go
+++ b/tests/fuzzers/bls12381/bls_fuzzer.go
@@ -20,8 +20,8 @@ import (
"bytes"
"fmt"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ledgerwatch/turbo-geth/common"
+ "github.com/ledgerwatch/turbo-geth/core/vm"
)
const (
diff --git a/tests/fuzzers/difficulty/debug/main.go b/tests/fuzzers/difficulty/debug/main.go
index 23516b3a0d..ac4d9c2b57 100644
--- a/tests/fuzzers/difficulty/debug/main.go
+++ b/tests/fuzzers/difficulty/debug/main.go
@@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"
- "github.com/ethereum/go-ethereum/tests/fuzzers/difficulty"
+ "github.com/ledgerwatch/turbo-geth/tests/fuzzers/difficulty"
)
func main() {
diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go
index e4c5dcf57c..1eb300d6cf 100644
--- a/tests/fuzzers/difficulty/difficulty-fuzz.go
+++ b/tests/fuzzers/difficulty/difficulty-fuzz.go
@@ -23,8 +23,8 @@ import (
"io"
"math/big"
- "github.com/ethereum/go-ethereum/consensus/ethash"
- "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ledgerwatch/turbo-geth/consensus/ethash"
+ "github.com/ledgerwatch/turbo-geth/core/types"
)
type fuzzer struct {
diff --git a/tests/fuzzers/les/debug/main.go b/tests/fuzzers/les/debug/main.go
index 09e087d4c8..e94dde02ad 100644
--- a/tests/fuzzers/les/debug/main.go
+++ b/tests/fuzzers/les/debug/main.go
@@ -21,7 +21,7 @@ import (
"io/ioutil"
"os"
- "github.com/ethereum/go-ethereum/tests/fuzzers/les"
+ "github.com/ledgerwatch/turbo-geth/tests/fuzzers/les"
)
func main() {
diff --git a/tests/fuzzers/les/les-fuzzer.go b/tests/fuzzers/les/les-fuzzer.go
index 9e896c2c1b..495f447e6e 100644
--- a/tests/fuzzers/les/les-fuzzer.go
+++ b/tests/fuzzers/les/les-fuzzer.go
@@ -22,17 +22,17 @@ import (
"io"
"math/big"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/consensus/ethash"
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/core/rawdb"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/core/vm"
- "github.com/ethereum/go-ethereum/crypto"
- l "github.com/ethereum/go-ethereum/les"
- "github.com/ethereum/go-ethereum/params"
- "github.com/ethereum/go-ethereum/rlp"
- "github.com/ethereum/go-ethereum/trie"
+ "github.com/ledgerwatch/turbo-geth/common"
+ "github.com/ledgerwatch/turbo-geth/consensus/ethash"
+ "github.com/ledgerwatch/turbo-geth/core"
+ "github.com/ledgerwatch/turbo-geth/core/rawdb"
+ "github.com/ledgerwatch/turbo-geth/core/types"
+ "github.com/ledgerwatch/turbo-geth/core/vm"
+ "github.com/ledgerwatch/turbo-geth/crypto"
+ l "github.com/ledgerwatch/turbo-geth/les"
+ "github.com/ledgerwatch/turbo-geth/params"
+ "github.com/ledgerwatch/turbo-geth/rlp"
+ "github.com/ledgerwatch/turbo-geth/trie"
)
var (
diff --git a/tests/fuzzers/rangeproof/debug/main.go b/tests/fuzzers/rangeproof/debug/main.go
index a81c69fea5..368dd48990 100644
--- a/tests/fuzzers/rangeproof/debug/main.go
+++ b/tests/fuzzers/rangeproof/debug/main.go
@@ -21,7 +21,7 @@ import (
"io/ioutil"
"os"
- "github.com/ethereum/go-ethereum/tests/fuzzers/rangeproof"
+ "github.com/ledgerwatch/turbo-geth/tests/fuzzers/rangeproof"
)
func main() {
diff --git a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go
index b82a380723..7e73303052 100644
--- a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go
+++ b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go
@@ -23,9 +23,9 @@ import (
"io"
"sort"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/ethdb/memorydb"
- "github.com/ethereum/go-ethereum/trie"
+ "github.com/ledgerwatch/turbo-geth/common"
+ "github.com/ledgerwatch/turbo-geth/ethdb/memorydb"
+ "github.com/ledgerwatch/turbo-geth/trie"
)
type kv struct {
diff --git a/tests/fuzzers/runtime/runtime_fuzz.go b/tests/fuzzers/runtime/runtime_fuzz.go
index 9b96045752..f23503be02 100644
--- a/tests/fuzzers/runtime/runtime_fuzz.go
+++ b/tests/fuzzers/runtime/runtime_fuzz.go
@@ -17,7 +17,7 @@
package runtime
import (
- "github.com/ethereum/go-ethereum/core/vm/runtime"
+ "github.com/ledgerwatch/turbo-geth/core/vm/runtime"
)
// Fuzz is the basic entry point for the go-fuzz tool
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 2af54df9aa..3c0109b7d2 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -26,18 +26,16 @@ import (
"strings"
"github.com/holiman/uint256"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/common/math"
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/core/rawdb"
- "github.com/ethereum/go-ethereum/core/state"
- "github.com/ethereum/go-ethereum/core/state/snapshot"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/core/vm"
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/ethdb"
- "github.com/ethereum/go-ethereum/params"
- "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ledgerwatch/turbo-geth/common/hexutil"
+ "github.com/ledgerwatch/turbo-geth/common/math"
+ "github.com/ledgerwatch/turbo-geth/core"
+ "github.com/ledgerwatch/turbo-geth/core/state"
+ "github.com/ledgerwatch/turbo-geth/core/types"
+ "github.com/ledgerwatch/turbo-geth/core/vm"
+ "github.com/ledgerwatch/turbo-geth/crypto"
+ "github.com/ledgerwatch/turbo-geth/ethdb"
+ "github.com/ledgerwatch/turbo-geth/params"
+ "github.com/ledgerwatch/turbo-geth/rlp"
"golang.org/x/crypto/sha3"
"github.com/ledgerwatch/turbo-geth/common"
@@ -108,14 +106,14 @@ type stEnvMarshaling struct {
//go:generate gencodec -type stTransaction -field-override stTransactionMarshaling -out gen_sttransaction.go
type stTransaction struct {
- GasPrice *uint256.Int `json:"gasPrice"`
- Nonce uint64 `json:"nonce"`
- To string `json:"to"`
- Data []string `json:"data"`
+ GasPrice *uint256.Int `json:"gasPrice"`
+ Nonce uint64 `json:"nonce"`
+ To string `json:"to"`
+ Data []string `json:"data"`
AccessLists []*types.AccessList `json:"accessLists,omitempty"`
- GasLimit []uint64 `json:"gasLimit"`
- Value []string `json:"value"`
- PrivateKey []byte `json:"secretKey"`
+ GasLimit []uint64 `json:"gasLimit"`
+ Value []string `json:"value"`
+ PrivateKey []byte `json:"secretKey"`
}
type stTransactionMarshaling struct {
--
GitLab