From 7f22b59f87cfda85a14eed6481da68e3dfba44a1 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@users.noreply.github.com>
Date: Tue, 23 Oct 2018 21:51:41 +0200
Subject: [PATCH] core/state: simplify proof methods (#17965)
This fixes the import cycle build error in core/vm tests.
There is no need to refer to core/vm for a type definition.
---
core/state/statedb.go | 20 +++++++++++++-------
core/vm/interface.go | 10 ----------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/core/state/statedb.go b/core/state/statedb.go
index b1bb53ed0..f0d7cdb6e 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -26,7 +26,6 @@ import (
"github.com/ethereum/go-ethereum/common"
"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/log"
"github.com/ethereum/go-ethereum/rlp"
@@ -46,6 +45,13 @@ var (
emptyCode = crypto.Keccak256Hash(nil)
)
+type proofList [][]byte
+
+func (n *proofList) Put(key []byte, value []byte) error {
+ *n = append(*n, value)
+ return nil
+}
+
// StateDBs within the ethereum protocol are used to store anything
// within the merkle trie. StateDBs take care of caching and storing
// nested states. It's the general query interface to retrieve:
@@ -259,21 +265,21 @@ func (self *StateDB) GetState(addr common.Address, hash common.Hash) common.Hash
}
// GetProof returns the MerkleProof for a given Account
-func (self *StateDB) GetProof(a common.Address) (vm.ProofList, error) {
- var proof vm.ProofList
+func (self *StateDB) GetProof(a common.Address) ([][]byte, error) {
+ var proof proofList
err := self.trie.Prove(crypto.Keccak256(a.Bytes()), 0, &proof)
- return proof, err
+ return [][]byte(proof), err
}
// GetProof returns the StorageProof for given key
-func (self *StateDB) GetStorageProof(a common.Address, key common.Hash) (vm.ProofList, error) {
- var proof vm.ProofList
+func (self *StateDB) GetStorageProof(a common.Address, key common.Hash) ([][]byte, error) {
+ var proof proofList
trie := self.StorageTrie(a)
if trie == nil {
return proof, errors.New("storage trie for requested address does not exist")
}
err := trie.Prove(crypto.Keccak256(key.Bytes()), 0, &proof)
- return proof, err
+ return [][]byte(proof), err
}
// GetCommittedState retrieves a value from the given account's committed storage trie.
diff --git a/core/vm/interface.go b/core/vm/interface.go
index 1ae98cf7a..fc15082f1 100644
--- a/core/vm/interface.go
+++ b/core/vm/interface.go
@@ -35,8 +35,6 @@ type StateDB interface {
SetNonce(common.Address, uint64)
GetCodeHash(common.Address) common.Hash
- GetProof(common.Address) (ProofList, error)
- GetStorageProof(common.Address, common.Hash) (ProofList, error)
GetCode(common.Address) []byte
SetCode(common.Address, []byte)
GetCodeSize(common.Address) int
@@ -80,11 +78,3 @@ type CallContext interface {
// Create a new contract
Create(env *EVM, me ContractRef, data []byte, gas, value *big.Int) ([]byte, common.Address, error)
}
-
-// MerkleProof
-type ProofList [][]byte
-
-func (n *ProofList) Put(key []byte, value []byte) error {
- *n = append(*n, value)
- return nil
-}
--
GitLab