Skip to content

Commit 29b7355

Browse files
author
Darioush Jalali
authored
core/state: unexport GetOrNewStateObject (#28804)
1 parent 407f779 commit 29b7355

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎core/state/state_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ func TestDump(t *testing.T) {
4848
s := &stateEnv{db: db, state: sdb}
4949

5050
// generate a few entries
51-
obj1 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01}))
51+
obj1 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x01}))
5252
obj1.AddBalance(big.NewInt(22))
53-
obj2 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01, 0x02}))
53+
obj2 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x01, 0x02}))
5454
obj2.SetCode(crypto.Keccak256Hash([]byte{3, 3, 3, 3, 3, 3, 3}), []byte{3, 3, 3, 3, 3, 3, 3})
55-
obj3 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x02}))
55+
obj3 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x02}))
5656
obj3.SetBalance(big.NewInt(44))
5757

5858
// write some of them to the trie
@@ -105,13 +105,13 @@ func TestIterativeDump(t *testing.T) {
105105
s := &stateEnv{db: db, state: sdb}
106106

107107
// generate a few entries
108-
obj1 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01}))
108+
obj1 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x01}))
109109
obj1.AddBalance(big.NewInt(22))
110-
obj2 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x01, 0x02}))
110+
obj2 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x01, 0x02}))
111111
obj2.SetCode(crypto.Keccak256Hash([]byte{3, 3, 3, 3, 3, 3, 3}), []byte{3, 3, 3, 3, 3, 3, 3})
112-
obj3 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x02}))
112+
obj3 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x02}))
113113
obj3.SetBalance(big.NewInt(44))
114-
obj4 := s.state.GetOrNewStateObject(common.BytesToAddress([]byte{0x00}))
114+
obj4 := s.state.getOrNewStateObject(common.BytesToAddress([]byte{0x00}))
115115
obj4.AddBalance(big.NewInt(1337))
116116

117117
// write some of them to the trie

‎core/state/statedb.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -374,43 +374,43 @@ func (s *StateDB) HasSelfDestructed(addr common.Address) bool {
374374

375375
// AddBalance adds amount to the account associated with addr.
376376
func (s *StateDB) AddBalance(addr common.Address, amount *big.Int) {
377-
stateObject := s.GetOrNewStateObject(addr)
377+
stateObject := s.getOrNewStateObject(addr)
378378
if stateObject != nil {
379379
stateObject.AddBalance(amount)
380380
}
381381
}
382382

383383
// SubBalance subtracts amount from the account associated with addr.
384384
func (s *StateDB) SubBalance(addr common.Address, amount *big.Int) {
385-
stateObject := s.GetOrNewStateObject(addr)
385+
stateObject := s.getOrNewStateObject(addr)
386386
if stateObject != nil {
387387
stateObject.SubBalance(amount)
388388
}
389389
}
390390

391391
func (s *StateDB) SetBalance(addr common.Address, amount *big.Int) {
392-
stateObject := s.GetOrNewStateObject(addr)
392+
stateObject := s.getOrNewStateObject(addr)
393393
if stateObject != nil {
394394
stateObject.SetBalance(amount)
395395
}
396396
}
397397

398398
func (s *StateDB) SetNonce(addr common.Address, nonce uint64) {
399-
stateObject := s.GetOrNewStateObject(addr)
399+
stateObject := s.getOrNewStateObject(addr)
400400
if stateObject != nil {
401401
stateObject.SetNonce(nonce)
402402
}
403403
}
404404

405405
func (s *StateDB) SetCode(addr common.Address, code []byte) {
406-
stateObject := s.GetOrNewStateObject(addr)
406+
stateObject := s.getOrNewStateObject(addr)
407407
if stateObject != nil {
408408
stateObject.SetCode(crypto.Keccak256Hash(code), code)
409409
}
410410
}
411411

412412
func (s *StateDB) SetState(addr common.Address, key, value common.Hash) {
413-
stateObject := s.GetOrNewStateObject(addr)
413+
stateObject := s.getOrNewStateObject(addr)
414414
if stateObject != nil {
415415
stateObject.SetState(key, value)
416416
}
@@ -431,7 +431,7 @@ func (s *StateDB) SetStorage(addr common.Address, storage map[common.Hash]common
431431
if _, ok := s.stateObjectsDestruct[addr]; !ok {
432432
s.stateObjectsDestruct[addr] = nil
433433
}
434-
stateObject := s.GetOrNewStateObject(addr)
434+
stateObject := s.getOrNewStateObject(addr)
435435
for k, v := range storage {
436436
stateObject.SetState(k, v)
437437
}
@@ -614,8 +614,8 @@ func (s *StateDB) setStateObject(object *stateObject) {
614614
s.stateObjects[object.Address()] = object
615615
}
616616

617-
// GetOrNewStateObject retrieves a state object or create a new state object if nil.
618-
func (s *StateDB) GetOrNewStateObject(addr common.Address) *stateObject {
617+
// getOrNewStateObject retrieves a state object or create a new state object if nil.
618+
func (s *StateDB) getOrNewStateObject(addr common.Address) *stateObject {
619619
stateObject := s.getStateObject(addr)
620620
if stateObject == nil {
621621
stateObject, _ = s.createObject(addr)

‎core/state/statedb_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func TestCopy(t *testing.T) {
166166
orig, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil)
167167

168168
for i := byte(0); i < 255; i++ {
169-
obj := orig.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
169+
obj := orig.getOrNewStateObject(common.BytesToAddress([]byte{i}))
170170
obj.AddBalance(big.NewInt(int64(i)))
171171
orig.updateStateObject(obj)
172172
}
@@ -180,9 +180,9 @@ func TestCopy(t *testing.T) {
180180

181181
// modify all in memory
182182
for i := byte(0); i < 255; i++ {
183-
origObj := orig.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
184-
copyObj := copy.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
185-
ccopyObj := ccopy.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
183+
origObj := orig.getOrNewStateObject(common.BytesToAddress([]byte{i}))
184+
copyObj := copy.getOrNewStateObject(common.BytesToAddress([]byte{i}))
185+
ccopyObj := ccopy.getOrNewStateObject(common.BytesToAddress([]byte{i}))
186186

187187
origObj.AddBalance(big.NewInt(2 * int64(i)))
188188
copyObj.AddBalance(big.NewInt(3 * int64(i)))
@@ -208,9 +208,9 @@ func TestCopy(t *testing.T) {
208208

209209
// Verify that the three states have been updated independently
210210
for i := byte(0); i < 255; i++ {
211-
origObj := orig.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
212-
copyObj := copy.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
213-
ccopyObj := ccopy.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
211+
origObj := orig.getOrNewStateObject(common.BytesToAddress([]byte{i}))
212+
copyObj := copy.getOrNewStateObject(common.BytesToAddress([]byte{i}))
213+
ccopyObj := ccopy.getOrNewStateObject(common.BytesToAddress([]byte{i}))
214214

215215
if want := big.NewInt(3 * int64(i)); origObj.Balance().Cmp(want) != 0 {
216216
t.Errorf("orig obj %d: balance mismatch: have %v, want %v", i, origObj.Balance(), want)
@@ -531,7 +531,7 @@ func (test *snapshotTest) checkEqual(state, checkstate *StateDB) error {
531531

532532
func TestTouchDelete(t *testing.T) {
533533
s := newStateEnv()
534-
s.state.GetOrNewStateObject(common.Address{})
534+
s.state.getOrNewStateObject(common.Address{})
535535
root, _ := s.state.Commit(0, false)
536536
s.state, _ = New(root, s.state.db, s.state.snaps)
537537

@@ -1158,7 +1158,7 @@ func TestDeleteStorage(t *testing.T) {
11581158
fastState, _ := New(root, db, snaps)
11591159
slowState, _ := New(root, db, nil)
11601160

1161-
obj := fastState.GetOrNewStateObject(addr)
1161+
obj := fastState.getOrNewStateObject(addr)
11621162
storageRoot := obj.data.Root
11631163

11641164
_, _, fastNodes, err := fastState.deleteStorage(addr, crypto.Keccak256Hash(addr[:]), storageRoot)

‎core/state/sync_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func makeTestState(scheme string) (ethdb.Database, Database, *trie.Database, com
5757
// Fill it with some arbitrary data
5858
var accounts []*testAccount
5959
for i := byte(0); i < 96; i++ {
60-
obj := state.GetOrNewStateObject(common.BytesToAddress([]byte{i}))
60+
obj := state.getOrNewStateObject(common.BytesToAddress([]byte{i}))
6161
acc := &testAccount{address: common.BytesToAddress([]byte{i})}
6262

6363
obj.AddBalance(big.NewInt(int64(11 * i)))

‎core/vm/runtime/runtime.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func Call(address common.Address, input []byte, cfg *Config) ([]byte, uint64, er
179179

180180
var (
181181
vmenv = NewEnv(cfg)
182-
sender = cfg.State.GetOrNewStateObject(cfg.Origin)
182+
sender = vm.AccountRef(cfg.Origin)
183183
statedb = cfg.State
184184
rules = cfg.ChainConfig.Rules(vmenv.Context.BlockNumber, vmenv.Context.Random != nil, vmenv.Context.Time)
185185
)

0 commit comments

Comments
 (0)