gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core/state: rename Delete/IsDeleted to Suicide/HasSuicided

Browse Source 
The delete/remove naming has caused endless confusion in the past.
This commit is contained in:
Felix Lange
2016-10-05 22:22:31 +02:00
parent 1f1ea18b54
commit 90fce8bfa6
9 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/state/state_object.go
View File

@ -83,10 +83,10 @@ type StateObject struct {
dirtyStorage Storage // Storage entries that need to be flushed to disk
// Cache flags.
// When an object is marked for deletion it will be delete from the trie
// during the "update" phase of the state transition
// When an object is marked suicided it will be delete from the trie
// during the "update" phase of the state transition.
dirtyCode bool // true if the code was updated
remove bool
suicided bool
deleted bool
onDirty func(addr common.Address) // Callback method to mark a state object newly dirty
}
@ -123,8 +123,8 @@ func (self *StateObject) setError(err error) {
}
}
func (self *StateObject) markForDeletion() {
self.remove = true
func (self *StateObject) markSuicided() {
self.suicided = true
if self.onDirty != nil {
self.onDirty(self.Address())
self.onDirty = nil
@ -266,7 +266,7 @@ func (self *StateObject) deepCopy(db *StateDB, onDirty func(addr common.Address)
stateObject.code = self.code
stateObject.dirtyStorage = self.dirtyStorage.Copy()
stateObject.cachedStorage = self.dirtyStorage.Copy()
stateObject.remove = self.remove
stateObject.suicided = self.suicided
stateObject.dirtyCode = self.dirtyCode
stateObject.deleted = self.deleted
return stateObject