forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Gary Rong 2024-06-20 09:46:09 +08:00
parent df115944d3
commit bb127178f0
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eth/protocols/snap/handler.go
View file

@ -332,7 +332,7 @@ func ServiceGetAccountRangeQuery(chain *core.BlockChain, req *GetAccountRangePac
return nil, nil return nil, nil
} }
} }
return accounts, proof.ByteList() return accounts, proof.List()
} }
func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesPacket) ([][]*StorageData, [][]byte) { func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesPacket) ([][]*StorageData, [][]byte) {
@ -434,9 +434,7 @@ func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesP
return nil, nil return nil, nil
} }
} }
for _, blob := range proof.ByteList() { 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).

12
eth/protocols/snap/sync_test.go
View file

@ -286,7 +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)
} }
} }
return keys, vals, proof.ByteList() return keys, vals, proof.List()
} }
// defaultStorageRequestHandler is a well-behaving storage request handler // defaultStorageRequestHandler is a well-behaving storage request handler
@ -368,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.ByteList() { proofs = append(proofs, proof.List()...)
proofs = append(proofs, blob)
}
break break
} }
} }
@ -427,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.ByteList() { proofs = append(proofs, proof.List()...)
proofs = append(proofs, blob)
}
break break
} }
} }
@ -614,7 +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:]...)
} }
if err := t.remote.OnAccounts(t, requestId, keys, vals, proof.ByteList()); err != nil { if err := t.remote.OnAccounts(t, requestId, keys, vals, proof.List()); 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

6
trie/trienode/proof.go
View file

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