core/state: fixed some comments (#21450)

This commit is contained in:
Giuseppe Bertone 2020-08-19 08:54:21 +02:00 committed by GitHub
parent f3bafecef7
commit 2ff464b29d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 15 deletions

View File

@ -375,22 +375,21 @@ func (s *stateObject) CommitTrie(db Database) error {
return err return err
} }
// AddBalance removes amount from c's balance. // AddBalance adds amount to s's balance.
// It is used to add funds to the destination account of a transfer. // It is used to add funds to the destination account of a transfer.
func (s *stateObject) AddBalance(amount *big.Int) { func (s *stateObject) AddBalance(amount *big.Int) {
// EIP158: We must check emptiness for the objects such that the account // EIP161: We must check emptiness for the objects such that the account
// clearing (0,0,0 objects) can take effect. // clearing (0,0,0 objects) can take effect.
if amount.Sign() == 0 { if amount.Sign() == 0 {
if s.empty() { if s.empty() {
s.touch() s.touch()
} }
return return
} }
s.SetBalance(new(big.Int).Add(s.Balance(), amount)) s.SetBalance(new(big.Int).Add(s.Balance(), amount))
} }
// SubBalance removes amount from c's balance. // SubBalance removes amount from s's balance.
// It is used to remove funds from the origin account of a transfer. // It is used to remove funds from the origin account of a transfer.
func (s *stateObject) SubBalance(amount *big.Int) { func (s *stateObject) SubBalance(amount *big.Int) {
if amount.Sign() == 0 { if amount.Sign() == 0 {
@ -455,7 +454,7 @@ func (s *stateObject) Code(db Database) []byte {
} }
// CodeSize returns the size of the contract code associated with this object, // CodeSize returns the size of the contract code associated with this object,
// or zero if none. This methos is an almost mirror of Code, but uses a cache // or zero if none. This method is an almost mirror of Code, but uses a cache
// inside the database to avoid loading codes seen recently. // inside the database to avoid loading codes seen recently.
func (s *stateObject) CodeSize(db Database) int { func (s *stateObject) CodeSize(db Database) int {
if s.code != nil { if s.code != nil {

View File

@ -58,7 +58,7 @@ func (n *proofList) Delete(key []byte) error {
panic("not supported") panic("not supported")
} }
// StateDBs within the ethereum protocol are used to store anything // StateDB structs within the ethereum protocol are used to store anything
// within the merkle trie. StateDBs take care of caching and storing // within the merkle trie. StateDBs take care of caching and storing
// nested states. It's the general query interface to retrieve: // nested states. It's the general query interface to retrieve:
// * Contracts // * Contracts
@ -115,7 +115,7 @@ type StateDB struct {
SnapshotCommits time.Duration SnapshotCommits time.Duration
} }
// Create a new state from a given trie. // New creates a new state from a given trie.
func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error) { func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error) {
tr, err := db.OpenTrie(root) tr, err := db.OpenTrie(root)
if err != nil { if err != nil {
@ -250,7 +250,7 @@ func (s *StateDB) Empty(addr common.Address) bool {
return so == nil || so.empty() return so == nil || so.empty()
} }
// Retrieve the balance from the given address or 0 if object not found // GetBalance retrieves the balance from the given address or 0 if object not found
func (s *StateDB) GetBalance(addr common.Address) *big.Int { func (s *StateDB) GetBalance(addr common.Address) *big.Int {
stateObject := s.getStateObject(addr) stateObject := s.getStateObject(addr)
if stateObject != nil { if stateObject != nil {
@ -318,7 +318,7 @@ func (s *StateDB) GetProof(a common.Address) ([][]byte, error) {
return [][]byte(proof), err return [][]byte(proof), err
} }
// GetProof returns the StorageProof for given key // GetStorageProof returns the StorageProof for given key
func (s *StateDB) GetStorageProof(a common.Address, key common.Hash) ([][]byte, error) { func (s *StateDB) GetStorageProof(a common.Address, key common.Hash) ([][]byte, error) {
var proof proofList var proof proofList
trie := s.StorageTrie(a) trie := s.StorageTrie(a)
@ -560,7 +560,7 @@ func (s *StateDB) setStateObject(object *stateObject) {
s.stateObjects[object.Address()] = object s.stateObjects[object.Address()] = object
} }
// Retrieve a state object or create a new state object if nil. // GetOrNewStateObject retrieves a state object or create a new state object if nil.
func (s *StateDB) GetOrNewStateObject(addr common.Address) *stateObject { func (s *StateDB) GetOrNewStateObject(addr common.Address) *stateObject {
stateObject := s.getStateObject(addr) stateObject := s.getStateObject(addr)
if stateObject == nil { if stateObject == nil {

View File

@ -144,7 +144,7 @@ func TestIntermediateLeaks(t *testing.T) {
} }
} }
// TestCopy tests that copying a statedb object indeed makes the original and // TestCopy tests that copying a StateDB object indeed makes the original and
// the copy independent of each other. This test is a regression test against // the copy independent of each other. This test is a regression test against
// https://github.com/ethereum/go-ethereum/pull/15549. // https://github.com/ethereum/go-ethereum/pull/15549.
func TestCopy(t *testing.T) { func TestCopy(t *testing.T) {
@ -647,11 +647,11 @@ func TestCopyCopyCommitCopy(t *testing.T) {
} }
// TestDeleteCreateRevert tests a weird state transition corner case that we hit // TestDeleteCreateRevert tests a weird state transition corner case that we hit
// while changing the internals of statedb. The workflow is that a contract is // while changing the internals of StateDB. The workflow is that a contract is
// self destructed, then in a followup transaction (but same block) it's created // self-destructed, then in a follow-up transaction (but same block) it's created
// again and the transaction reverted. // again and the transaction reverted.
// //
// The original statedb implementation flushed dirty objects to the tries after // The original StateDB implementation flushed dirty objects to the tries after
// each transaction, so this works ok. The rework accumulated writes in memory // each transaction, so this works ok. The rework accumulated writes in memory
// first, but the journal wiped the entire state object on create-revert. // first, but the journal wiped the entire state object on create-revert.
func TestDeleteCreateRevert(t *testing.T) { func TestDeleteCreateRevert(t *testing.T) {
@ -681,7 +681,7 @@ func TestDeleteCreateRevert(t *testing.T) {
} }
} }
// TestMissingTrieNodes tests that if the statedb fails to load parts of the trie, // TestMissingTrieNodes tests that if the StateDB fails to load parts of the trie,
// the Commit operation fails with an error // the Commit operation fails with an error
// If we are missing trie nodes, we should not continue writing to the trie // If we are missing trie nodes, we should not continue writing to the trie
func TestMissingTrieNodes(t *testing.T) { func TestMissingTrieNodes(t *testing.T) {