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

fix ProofTracer interface (#666)

Browse source 
* fix `TestProofWithDeletion`

* fix `ProofTracer` interface
This commit is contained in:
HAOYUatHZ 2024-03-12 19:13:56 +08:00 committed by GitHub
parent 521183581a
commit 2829e66aea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
trie/zk_trie_proof_test.go
View file

@ -220,7 +220,7 @@ func TestProofWithDeletion(t *testing.T) {
proofTracer := tr.NewProofTracer() proofTracer := tr.NewProofTracer()
err = proofTracer.Prove(s_key1.Bytes(), 0, proof) err = proofTracer.Prove(s_key1.Bytes(), proof)
assert.NoError(t, err) assert.NoError(t, err)
nd, err := tr.TryGet(key2) nd, err := tr.TryGet(key2)
assert.NoError(t, err) assert.NoError(t, err)
@ -228,7 +228,7 @@ func TestProofWithDeletion(t *testing.T) {
s_key2, err := zkt.ToSecureKeyBytes(bytes.Repeat([]byte("x"), 32)) s_key2, err := zkt.ToSecureKeyBytes(bytes.Repeat([]byte("x"), 32))
assert.NoError(t, err) assert.NoError(t, err)
err = proofTracer.Prove(s_key2.Bytes(), 0, proof) err = proofTracer.Prove(s_key2.Bytes(), proof)
assert.NoError(t, err) assert.NoError(t, err)
//assert.Equal(t, len(sibling1), len(delTracer.GetProofs())) //assert.Equal(t, len(sibling1), len(delTracer.GetProofs()))
@ -260,9 +260,9 @@ func TestProofWithDeletion(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
proofTracer = tr.NewProofTracer() proofTracer = tr.NewProofTracer()
err = proofTracer.Prove(s_key1.Bytes(), 0, proof) err = proofTracer.Prove(s_key1.Bytes(), proof)
assert.NoError(t, err) assert.NoError(t, err)
err = proofTracer.Prove(s_key2.Bytes(), 0, proof) err = proofTracer.Prove(s_key2.Bytes(), proof)
assert.NoError(t, err) assert.NoError(t, err)
proofTracer.MarkDeletion(s_key1.Bytes()) proofTracer.MarkDeletion(s_key1.Bytes())

3
trie/zktrie_deletionproof.go
View file

@ -137,7 +137,8 @@ func (t *ProofTracer) MarkDeletion(key []byte) {
// Prove act the same as zktrie.Prove, while also collect the raw path // Prove act the same as zktrie.Prove, while also collect the raw path
// for collecting deletion proofs in a post-work // for collecting deletion proofs in a post-work
func (t *ProofTracer) Prove(key []byte, fromLevel uint, proofDb ethdb.KeyValueWriter) error { func (t *ProofTracer) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
fromLevel := uint(0)
var mptPath []*zktrie.Node var mptPath []*zktrie.Node
err := t.ZkTrie.ProveWithDeletion(key, fromLevel, err := t.ZkTrie.ProveWithDeletion(key, fromLevel,
func(n *zktrie.Node) error { func(n *zktrie.Node) error {