From bbb57fd64b70e3c843b5171d0a4719cf457374fc Mon Sep 17 00:00:00 2001
From: aaronbuchwald <aaron.buchwald56@gmail.com>
Date: Fri, 30 Apr 2021 07:10:12 -0400
Subject: [PATCH] core/state: remove toAddr helper in tests (#22772)
---
core/state/state_test.go | 14 ++++++--------
core/state/statedb_test.go | 6 +++---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/core/state/state_test.go b/core/state/state_test.go
index 22e93d7a9..956653146 100644
--- a/core/state/state_test.go
+++ b/core/state/state_test.go
@@ -27,8 +27,6 @@ import (
"github.com/ethereum/go-ethereum/ethdb"
)
-var toAddr = common.BytesToAddress
-
type stateTest struct {
db ethdb.Database
state *StateDB
@@ -46,11 +44,11 @@ func TestDump(t *testing.T) {
s := &stateTest{db: db, state: sdb}
// generate a few entries
- obj1 := s.state.GetOrNewStateObject(toAddr([]byte{0x01}))
+ obj1 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01}))
obj1.AddBalance(big.NewInt(22))
- obj2 := s.state.GetOrNewStateObject(toAddr([]byte{0x01, 0x02}))
+ obj2 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01, 0x02}))
obj2.SetCode(crypto.Keccak256Hash([]byte{3, 3, 3, 3, 3, 3, 3}), []byte{3, 3, 3, 3, 3, 3, 3})
- obj3 := s.state.GetOrNewStateObject(toAddr([]byte{0x02}))
+ obj3 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x02}))
obj3.SetBalance(big.NewInt(44))
// write some of them to the trie
@@ -108,7 +106,7 @@ func TestNull(t *testing.T) {
}
func TestSnapshot(t *testing.T) {
- stateobjaddr := toAddr([]byte("aa"))
+ stateobjaddr := common.BytesToAddress([]byte("aa"))
var storageaddr common.Hash
data1 := common.BytesToHash([]byte{42})
data2 := common.BytesToHash([]byte{43})
@@ -150,8 +148,8 @@ func TestSnapshotEmpty(t *testing.T) {
func TestSnapshot2(t *testing.T) {
state, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase()), nil)
- stateobjaddr0 := toAddr([]byte("so0"))
- stateobjaddr1 := toAddr([]byte("so1"))
+ stateobjaddr0 := common.BytesToAddress([]byte("so0"))
+ stateobjaddr1 := common.BytesToAddress([]byte("so1"))
var storageaddr common.Hash
data0 := common.BytesToHash([]byte{17})
diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go
index 220e28525..9524e3730 100644
--- a/core/state/statedb_test.go
+++ b/core/state/statedb_test.go
@@ -672,7 +672,7 @@ func TestDeleteCreateRevert(t *testing.T) {
// Create an initial state with a single contract
state, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase()), nil)
- addr := toAddr([]byte("so"))
+ addr := common.BytesToAddress([]byte("so"))
state.SetBalance(addr, big.NewInt(1))
root, _ := state.Commit(false)
@@ -705,11 +705,11 @@ func TestMissingTrieNodes(t *testing.T) {
db := NewDatabase(memDb)
var root common.Hash
state, _ := New(common.Hash{}, db, nil)
- addr := toAddr([]byte("so"))
+ addr := common.BytesToAddress([]byte("so"))
{
state.SetBalance(addr, big.NewInt(1))
state.SetCode(addr, []byte{1, 2, 3})
- a2 := toAddr([]byte("another"))
+ a2 := common.BytesToAddress([]byte("another"))
state.SetBalance(a2, big.NewInt(100))
state.SetCode(a2, []byte{1, 2, 4})
root, _ = state.Commit(false)
--
GitLab