core/state: remove toAddr helper in tests (#22772)

This commit is contained in:
aaronbuchwald
2021-04-30 07:10:12 -04:00
committed by GitHub
parent f66f1a16b3
commit bbb57fd64b
2 changed files with 9 additions and 11 deletions

View File

@ -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})