@@ -3,6 +3,7 @@ package hamt
33import (
44 "bytes"
55 "context"
6+ "crypto/sha256"
67 "encoding/hex"
78 "fmt"
89 "math/rand"
@@ -68,41 +69,27 @@ var shortIdentityHash = func(k []byte) []byte {
6869 return res
6970}
7071
71- var murmurHash = hash
72-
7372func TestCanonicalStructure (t * testing.T ) {
74- hash = identityHash
75- defer func () {
76- hash = murmurHash
77- }()
78- addAndRemoveKeys (t , defaultBitWidth , []string {"K" }, []string {"B" })
79- addAndRemoveKeys (t , defaultBitWidth , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" })
73+ addAndRemoveKeys (t , []string {"K" }, []string {"B" }, UseHashFunction (identityHash ))
74+ addAndRemoveKeys (t , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" })
8075}
8176
8277func TestCanonicalStructureAlternateBitWidth (t * testing.T ) {
83- hash = identityHash
84- defer func () {
85- hash = murmurHash
86- }()
87- addAndRemoveKeys (t , 7 , []string {"K" }, []string {"B" })
88- addAndRemoveKeys (t , 7 , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" })
89- addAndRemoveKeys (t , 6 , []string {"K" }, []string {"B" })
90- addAndRemoveKeys (t , 6 , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" })
91- addAndRemoveKeys (t , 5 , []string {"K" }, []string {"B" })
92- addAndRemoveKeys (t , 5 , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" })
78+ addAndRemoveKeys (t , []string {"K" }, []string {"B" }, UseTreeBitWidth (7 ), UseHashFunction (identityHash ))
79+ addAndRemoveKeys (t , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" }, UseTreeBitWidth (7 ), UseHashFunction (identityHash ))
80+ addAndRemoveKeys (t , []string {"K" }, []string {"B" }, UseTreeBitWidth (6 ), UseHashFunction (identityHash ))
81+ addAndRemoveKeys (t , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" }, UseTreeBitWidth (6 ), UseHashFunction (identityHash ))
82+ addAndRemoveKeys (t , []string {"K" }, []string {"B" }, UseTreeBitWidth (5 ), UseHashFunction (identityHash ))
83+ addAndRemoveKeys (t , []string {"K0" , "K1" , "KAA1" , "KAA2" , "KAA3" }, []string {"KAA4" }, UseTreeBitWidth (5 ), UseHashFunction (identityHash ))
9384}
9485func TestOverflow (t * testing.T ) {
95- hash = identityHash
96- defer func () {
97- hash = murmurHash
98- }()
9986 keys := make ([]string , 4 )
10087 for i := range keys {
10188 keys [i ] = strings .Repeat ("A" , 32 ) + fmt .Sprintf ("%d" , i )
10289 }
10390
10491 cs := cbor .NewCborStore (newMockBlocks ())
105- n := NewNode (cs )
92+ n := NewNode (cs , UseHashFunction ( identityHash ) )
10693 for _ , k := range keys [:3 ] {
10794 if err := n .Set (context .Background (), k , "foobar" ); err != nil {
10895 t .Error (err )
@@ -120,13 +107,13 @@ func TestOverflow(t *testing.T) {
120107 }
121108
122109 // Now, try fetching with a shorter hash function.
123- hash = shortIdentityHash
110+ n . hash = shortIdentityHash
124111 if err := n .Find (context .Background (), keys [0 ], nil ); err != ErrMaxDepth {
125112 t .Errorf ("expected error %q, got %q" , ErrMaxDepth , err )
126113 }
127114}
128115
129- func addAndRemoveKeys (t * testing.T , bitWidth int , keys []string , extraKeys []string ) {
116+ func addAndRemoveKeys (t * testing.T , keys []string , extraKeys []string , options ... Option ) {
130117 ctx := context .Background ()
131118 vals := make (map [string ][]byte )
132119 for i := 0 ; i < len (keys ); i ++ {
@@ -135,7 +122,7 @@ func addAndRemoveKeys(t *testing.T, bitWidth int, keys []string, extraKeys []str
135122 }
136123
137124 cs := cbor .NewCborStore (newMockBlocks ())
138- begn := NewNode (cs , UseTreeBitWidth ( bitWidth ) )
125+ begn := NewNode (cs , options ... )
139126 for _ , k := range keys {
140127 if err := begn .Set (ctx , k , vals [k ]); err != nil {
141128 t .Fatal (err )
@@ -158,7 +145,8 @@ func addAndRemoveKeys(t *testing.T, bitWidth int, keys []string, extraKeys []str
158145 t .Fatal (err )
159146 }
160147 n .store = cs
161- n .bitWidth = bitWidth
148+ n .hash = begn .hash
149+ n .bitWidth = begn .bitWidth
162150 for k , v := range vals {
163151 var out []byte
164152 err := n .Find (ctx , k , & out )
@@ -193,7 +181,8 @@ func addAndRemoveKeys(t *testing.T, bitWidth int, keys []string, extraKeys []str
193181 t .Fatal (err )
194182 }
195183 n2 .store = cs
196- n2 .bitWidth = bitWidth
184+ n2 .hash = begn .hash
185+ n2 .bitWidth = begn .bitWidth
197186 if ! nodesEqual (t , cs , & n , & n2 ) {
198187 t .Fatal ("nodes should be equal" )
199188 }
@@ -205,7 +194,7 @@ func dotGraphRec(n *Node, name *int) {
205194 if p .isShard () {
206195 * name ++
207196 fmt .Printf ("\t n%d -> n%d;\n " , cur , * name )
208- nd , err := p .loadChild (context .Background (), n .store , n .bitWidth )
197+ nd , err := p .loadChild (context .Background (), n .store , n .bitWidth , n . hash )
209198 if err != nil {
210199 panic (err )
211200 }
@@ -237,7 +226,7 @@ func statsrec(n *Node, st *hamtStats) {
237226 st .totalNodes ++
238227 for _ , p := range n .Pointers {
239228 if p .isShard () {
240- nd , err := p .loadChild (context .Background (), n .store , n .bitWidth )
229+ nd , err := p .loadChild (context .Background (), n .store , n .bitWidth , n . hash )
241230 if err != nil {
242231 panic (err )
243232 }
@@ -251,17 +240,28 @@ func statsrec(n *Node, st *hamtStats) {
251240}
252241
253242func TestHash (t * testing.T ) {
254- h1 := hash ([]byte ("abcd" ))
255- h2 := hash ([]byte ("abce" ))
243+ h1 := defaultHashFunction ([]byte ("abcd" ))
244+ h2 := defaultHashFunction ([]byte ("abce" ))
256245 if h1 [0 ] == h2 [0 ] && h1 [1 ] == h2 [1 ] && h1 [3 ] == h2 [3 ] {
257246 t .Fatal ("Hash should give different strings different hash prefixes" )
258247 }
259248}
260249
261250func TestBasic (t * testing.T ) {
251+ testBasic (t )
252+ }
253+
254+ func TestSha256 (t * testing.T ) {
255+ testBasic (t , UseHashFunction (func (in []byte ) []byte {
256+ out := sha256 .Sum256 (in )
257+ return out [:]
258+ }))
259+ }
260+
261+ func testBasic (t * testing.T , options ... Option ) {
262262 ctx := context .Background ()
263263 cs := cbor .NewCborStore (newMockBlocks ())
264- begn := NewNode (cs )
264+ begn := NewNode (cs , options ... )
265265
266266 val := []byte ("cat dog bear" )
267267 if err := begn .Set (ctx , "foo" , val ); err != nil {
@@ -282,7 +282,7 @@ func TestBasic(t *testing.T) {
282282 t .Fatal (err )
283283 }
284284
285- n , err := LoadNode (ctx , cs , c )
285+ n , err := LoadNode (ctx , cs , c , options ... )
286286 if err != nil {
287287 t .Fatal (err )
288288 }
@@ -381,6 +381,7 @@ func TestSetGet(t *testing.T) {
381381 t .Fatal (err )
382382 }
383383 n .store = cs
384+ n .hash = defaultHashFunction
384385 n .bitWidth = defaultBitWidth
385386 bef = time .Now ()
386387 //for k, v := range vals {
0 commit comments