tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trie/trienode: avoid unnecessary copy (#30019)

Browse Source 
* avoid unnecessary copy

* delete the never used function ProofList

* eth/protocols/snap, trie/trienode: polish the code

---------

Co-authored-by: Gary Rong <garyrong0905@gmail.com>
This commit is contained in:
maskpp 2024-06-20 11:47:29 +08:00 committed by GitHub
parent 27008408a5
commit 00675c5876
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eth/protocols/snap/handler.go
View File

@ -332,11 +332,7 @@ func ServiceGetAccountRangeQuery(chain *core.BlockChain, req *GetAccountRangePac
return nil, nil return nil, nil
} }
} }
var proofs [][]byte return accounts, proof.List()
for _, blob := range proof.List() {
proofs = append(proofs, blob)
}
return accounts, proofs
} }
func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesPacket) ([][]*StorageData, [][]byte) { func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesPacket) ([][]*StorageData, [][]byte) {
@ -438,9 +434,7 @@ func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesP
return nil, nil return nil, nil
} }
} }
for _, blob := range proof.List() { proofs = append(proofs, proof.List()...)
proofs = append(proofs, blob)
}
// Proof terminates the reply as proofs are only added if a node // Proof terminates the reply as proofs are only added if a node
// refuses to serve more data (exception when a contract fetch is // refuses to serve more data (exception when a contract fetch is
// finishing, but that's that). // finishing, but that's that).

19
eth/protocols/snap/sync_test.go
View File

@ -286,10 +286,7 @@ func createAccountRequestResponse(t *testPeer, root common.Hash, origin common.H
t.logger.Error("Could not prove last item", "error", err) t.logger.Error("Could not prove last item", "error", err)
} }
} }
for _, blob := range proof.List() { return keys, vals, proof.List()
proofs = append(proofs, blob)
}
return keys, vals, proofs
} }
// defaultStorageRequestHandler is a well-behaving storage request handler // defaultStorageRequestHandler is a well-behaving storage request handler
@ -371,9 +368,7 @@ func createStorageRequestResponse(t *testPeer, root common.Hash, accounts []comm
t.logger.Error("Could not prove last item", "error", err) t.logger.Error("Could not prove last item", "error", err)
} }
} }
for _, blob := range proof.List() { proofs = append(proofs, proof.List()...)
proofs = append(proofs, blob)
}
break break
} }
} }
@ -430,9 +425,7 @@ func createStorageRequestResponseAlwaysProve(t *testPeer, root common.Hash, acco
t.logger.Error("Could not prove last item", "error", err) t.logger.Error("Could not prove last item", "error", err)
} }
} }
for _, blob := range proof.List() { proofs = append(proofs, proof.List()...)
proofs = append(proofs, blob)
}
break break
} }
} }
@ -586,7 +579,6 @@ func testSyncBloatedProof(t *testing.T, scheme string) {
source.accountRequestHandler = func(t *testPeer, requestId uint64, root common.Hash, origin common.Hash, limit common.Hash, cap uint64) error { source.accountRequestHandler = func(t *testPeer, requestId uint64, root common.Hash, origin common.Hash, limit common.Hash, cap uint64) error {
var ( var (
proofs [][]byte
keys []common.Hash keys []common.Hash
vals [][]byte vals [][]byte
) )
@ -618,10 +610,7 @@ func testSyncBloatedProof(t *testing.T, scheme string) {
keys = append(keys[:1], keys[2:]...) keys = append(keys[:1], keys[2:]...)
vals = append(vals[:1], vals[2:]...) vals = append(vals[:1], vals[2:]...)
} }
for _, blob := range proof.List() { if err := t.remote.OnAccounts(t, requestId, keys, vals, proof.List()); err != nil {
proofs = append(proofs, blob)
}
if err := t.remote.OnAccounts(t, requestId, keys, vals, proofs); err != nil {
t.logger.Info("remote error on delivery (as expected)", "error", err) t.logger.Info("remote error on delivery (as expected)", "error", err)
t.term() t.term()
// This is actually correct, signal to exit the test successfully // This is actually correct, signal to exit the test successfully

10
trie/trienode/proof.go
View File

@ -102,14 +102,14 @@ func (db *ProofSet) DataSize() int {
return db.dataSize return db.dataSize
} }
// List converts the node set to a ProofList // List converts the node set to a slice of bytes.
func (db *ProofSet) List() ProofList { func (db *ProofSet) List() [][]byte {
db.lock.RLock() db.lock.RLock()
defer db.lock.RUnlock() defer db.lock.RUnlock()
var values ProofList values := make([][]byte, len(db.order))
for _, key := range db.order { for i, key := range db.order {
values = append(values, db.nodes[key]) values[i] = db.nodes[key]
} }
return values return values
} }