Skip to content

Allow reusing slice in GetParkedNodes #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Allow reusing slice in GetParkedNodes #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5959f
Allow reusing slice in GetParkedNodes
poszu Jan 5, 2023
cccb6b3
Document merkle::Tree::GetParkedNodes
poszu Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions merkle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,9 @@ func (t *Tree) RootAndProof() ([]byte, [][]byte) {
return ephemeralNode.value, ephemeralProof
}

func (t *Tree) GetParkedNodes() [][]byte {
var ret [][]byte
// GetParkedNodes appends parked nodes from all layers
// starting with the base layer to the `ret`.
func (t *Tree) GetParkedNodes(ret [][]byte) [][]byte {
layer := t.baseLayer
for {
ret = append(ret, layer.parking.value)
Expand Down
14 changes: 7 additions & 7 deletions merkle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,22 +438,22 @@ func TestTree_GetParkedNodes(t *testing.T) {
r.NoError(tree.AddLeaf([]byte{0}))
r.EqualValues(
[][]byte{{0}},
tree.GetParkedNodes())
tree.GetParkedNodes(nil))

r.NoError(tree.AddLeaf([]byte{1}))
r.EqualValues(
[][]byte{nil, decode(r, "b413f47d13ee2fe6c845b2ee141af81de858df4ec549a58b7970bb96645bc8d2")},
tree.GetParkedNodes())
tree.GetParkedNodes(nil))

r.NoError(tree.AddLeaf([]byte{2}))
r.EqualValues(
[][]byte{{2}, decode(r, "b413f47d13ee2fe6c845b2ee141af81de858df4ec549a58b7970bb96645bc8d2")},
tree.GetParkedNodes())
tree.GetParkedNodes(nil))

r.NoError(tree.AddLeaf([]byte{3}))
r.EqualValues(
[][]byte{nil, nil, decode(r, "7699a4fdd6b8b6908a344f73b8f05c8e1400f7253f544602c442ff5c65504b24")},
tree.GetParkedNodes())
tree.GetParkedNodes(nil))
}

func TestTree_SetParkedNodes(t *testing.T) {
Expand All @@ -464,21 +464,21 @@ func TestTree_SetParkedNodes(t *testing.T) {
r.NoError(tree.SetParkedNodes([][]byte{{0}}))
r.NoError(tree.AddLeaf([]byte{1}))
parkedNodes := [][]byte{nil, decode(r, "b413f47d13ee2fe6c845b2ee141af81de858df4ec549a58b7970bb96645bc8d2")}
r.EqualValues(parkedNodes, tree.GetParkedNodes())
r.EqualValues(parkedNodes, tree.GetParkedNodes(nil))

tree, err = NewTreeBuilder().Build()
r.NoError(err)
r.NoError(tree.SetParkedNodes(parkedNodes))
r.NoError(tree.AddLeaf([]byte{2}))
parkedNodes = [][]byte{{2}, decode(r, "b413f47d13ee2fe6c845b2ee141af81de858df4ec549a58b7970bb96645bc8d2")}
r.EqualValues(parkedNodes, tree.GetParkedNodes())
r.EqualValues(parkedNodes, tree.GetParkedNodes(nil))

tree, err = NewTreeBuilder().Build()
r.NoError(err)
r.NoError(tree.SetParkedNodes(parkedNodes))
r.NoError(tree.AddLeaf([]byte{3}))
parkedNodes = [][]byte{nil, nil, decode(r, "7699a4fdd6b8b6908a344f73b8f05c8e1400f7253f544602c442ff5c65504b24")}
r.EqualValues(parkedNodes, tree.GetParkedNodes())
r.EqualValues(parkedNodes, tree.GetParkedNodes(nil))
}

func decode(r *require.Assertions, hexString string) []byte {
Expand Down