mirror of
https://github.com/vbatts/merkle.git
synced 2025-03-16 21:56:19 +00:00
.: checksum for an unbalanced tree
This commit is contained in:
parent
205a82f081
commit
da81f82e13
2 changed files with 39 additions and 37 deletions
48
node_test.go
48
node_test.go
|
@ -1,7 +1,7 @@
|
|||
package merkle
|
||||
|
||||
import (
|
||||
"log"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
@ -10,8 +10,9 @@ var words string = `Who were expelled from the academy for crazy & publishing ob
|
|||
|
||||
func TestNodeSums(t *testing.T) {
|
||||
var (
|
||||
nodes []*Node
|
||||
h = DefaultHash.New()
|
||||
nodes []*Node
|
||||
h = DefaultHash.New()
|
||||
expectedChecksum = "819fe8fed7a46900bd0613344c5ba2be336c74db"
|
||||
)
|
||||
for _, word := range strings.Split(words, " ") {
|
||||
h.Reset()
|
||||
|
@ -28,39 +29,14 @@ func TestNodeSums(t *testing.T) {
|
|||
break
|
||||
}
|
||||
}
|
||||
for i := range nodes {
|
||||
c, err := nodes[i].Checksum()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
t.Logf("checksum %x", c)
|
||||
if len(nodes) != 1 {
|
||||
t.Errorf("%d nodes", len(nodes))
|
||||
}
|
||||
if len(nodes) > 0 {
|
||||
t.Errorf("%d nodes; %d characters", len(nodes), len(words))
|
||||
c, err := nodes[0].Checksum()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
if gotChecksum := fmt.Sprintf("%x", c); gotChecksum != expectedChecksum {
|
||||
t.Errorf("expected checksum %q, got %q", expectedChecksum, gotChecksum)
|
||||
}
|
||||
}
|
||||
|
||||
func levelUp(nodes []*Node) []*Node {
|
||||
var (
|
||||
newNodes []*Node
|
||||
last = len(nodes) - 1
|
||||
)
|
||||
|
||||
for i := range nodes {
|
||||
if i%2 == 0 {
|
||||
if i == last {
|
||||
// TODO rebalance the last parent
|
||||
log.Println("WHOOP")
|
||||
}
|
||||
n := NewNode()
|
||||
n.Left = nodes[i]
|
||||
n.Left.Parent = n
|
||||
newNodes = append(newNodes, n)
|
||||
} else {
|
||||
n := newNodes[len(newNodes)-1]
|
||||
n.Right = nodes[i]
|
||||
n.Right.Parent = n
|
||||
}
|
||||
}
|
||||
return newNodes
|
||||
}
|
||||
|
|
28
tree.go
28
tree.go
|
@ -1,5 +1,31 @@
|
|||
package merkle
|
||||
|
||||
type Tree struct {
|
||||
Nodes []Node
|
||||
Nodes []*Node
|
||||
}
|
||||
|
||||
func levelUp(nodes []*Node) []*Node {
|
||||
var (
|
||||
newNodes []*Node
|
||||
last = len(nodes) - 1
|
||||
)
|
||||
|
||||
for i := range nodes {
|
||||
if i%2 == 0 {
|
||||
if i == last {
|
||||
// last nodes on uneven node counts get pushed up, to be in the next level up
|
||||
newNodes = append(newNodes, nodes[i])
|
||||
continue
|
||||
}
|
||||
n := NewNode()
|
||||
n.Left = nodes[i]
|
||||
n.Left.Parent = n
|
||||
newNodes = append(newNodes, n)
|
||||
} else {
|
||||
n := newNodes[len(newNodes)-1]
|
||||
n.Right = nodes[i]
|
||||
n.Right.Parent = n
|
||||
}
|
||||
}
|
||||
return newNodes
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue