@@ -76,15 +76,12 @@ type budGoldenStateProof struct {
7676 EndValue string `json:"endValue"`
7777}
7878
79- // budGoldenRecord is one recorded block: its budlets, its serialized BUD tree, its BUD hash, and the BUD proof of each
80- // budlet. Byte fields are lowercase hex.
79+ // budGoldenRecord is one recorded block: its budlets, its BUD hash, and the BUD proof of each budlet. Byte fields are
80+ // lowercase hex.
8181type budGoldenRecord struct {
8282 // The block's budlets, sorted by key.
8383 Budlets []budGoldenBudlet `json:"budlets"`
8484
85- // The block's serialized BUD tree.
86- Tree string `json:"tree"`
87-
8885 // The block's BUD hash.
8986 BUDHash string `json:"budHash"`
9087
@@ -149,9 +146,9 @@ func TestCurrentVersionsHaveGoldenFile(t *testing.T) {
149146 require .NoError (t , err , "no golden file for the current versions; record %s with -bud-golden-record" , path )
150147}
151148
152- // verifyBUDGoldenRecord requires the recorded BUD tree and BUD proofs to deserialize to the recorded budlets and
153- // compute the recorded BUD hash. A record of the current versions must also be reproduced by NewBUDTree() and
154- // BuildBUDProof ().
149+ // verifyBUDGoldenRecord requires the recorded BUD proofs to deserialize to the recorded budlets and compute the
150+ // recorded BUD hash. A record of the current versions must also be reproduced by ComputeBUDTreeHash(),
151+ // ComputeBUDHash(), and NewBUDProof ().
155152func verifyBUDGoldenRecord (
156153 t * testing.T ,
157154 // The position of the record in its golden file.
@@ -168,34 +165,25 @@ func verifyBUDGoldenRecord(
168165 budlets = append (budlets , decodeBUDGoldenBudlet (t , index , i , recorded ))
169166 }
170167
171- serializedTree , err := hex .DecodeString (record .Tree )
172- require .NoError (t , err , "record %d tree" , index )
173- deserializedTree , err := DeserializeBUDTree (serializedTree )
174- require .NoError (t , err , "record %d tree" , index )
175- require .Equal (t , budlets , deserializedTree .Budlets (), "record %d deserialized tree" , index )
176- budHash := deserializedTree .BUDHash ()
177- require .Equal (t , record .BUDHash , hex .EncodeToString (budHash [:]), "record %d BUD hash" , index )
178-
179168 require .Len (t , record .Proofs , len (budlets ), "record %d" , index )
180169 for i , budlet := range budlets {
181170 serialized , err := hex .DecodeString (record .Proofs [i ])
182171 require .NoError (t , err , "record %d budlet %d" , index , i )
183172 deserialized , err := DeserializeBUDProof (serialized )
184173 require .NoError (t , err , "record %d budlet %d" , index , i )
185174 require .Equal (t , budlet , deserialized .Budlet (), "record %d budlet %d" , index , i )
186- require .Equal (t , budHash , deserialized .ComputeBUDHash (), "record %d budlet %d" , index , i )
175+ budHash , err := deserialized .ComputeBUDHash ()
176+ require .NoError (t , err , "record %d budlet %d" , index , i )
177+ require .Equal (t , record .BUDHash , hex .EncodeToString (budHash [:]), "record %d budlet %d" , index , i )
187178 }
188179
189180 if ! current {
190181 return
191182 }
192- tree , err := NewBUDTree (budlets )
193- require .NoError (t , err , "record %d" , index )
194- require .Equal (t , record .Tree , hex .EncodeToString (tree .Serialize ()), "record %d tree" , index )
195- require .Equal (t , budHash , tree .BUDHash (), "record %d BUD hash" , index )
183+ budHash := budHashOf (t , budlets )
184+ require .Equal (t , record .BUDHash , hex .EncodeToString (budHash [:]), "record %d BUD hash" , index )
196185 for i , budlet := range budlets {
197- proof , found := tree .BuildBUDProof (budlet .Key ())
198- require .True (t , found , "record %d budlet %d" , index , i )
186+ proof := mustNewBUDProof (t , budlets , budlet .Key ())
199187 require .Equal (t , record .Proofs [i ], hex .EncodeToString (proof .Serialize ()),
200188 "record %d budlet %d" , index , i )
201189 }
@@ -364,12 +352,9 @@ func recordBUDGoldenFile(t *testing.T) {
364352func newBUDGoldenRecord (t * testing.T , budlets []* Budlet ) budGoldenRecord {
365353 t .Helper ()
366354
367- tree , err := NewBUDTree (budlets )
368- require .NoError (t , err )
369- budHash := tree .BUDHash ()
355+ budHash := budHashOf (t , budlets )
370356 record := budGoldenRecord {
371357 Budlets : make ([]budGoldenBudlet , 0 , len (budlets )),
372- Tree : hex .EncodeToString (tree .Serialize ()),
373358 BUDHash : hex .EncodeToString (budHash [:]),
374359 Proofs : make ([]string , 0 , len (budlets )),
375360 }
@@ -380,8 +365,7 @@ func newBUDGoldenRecord(t *testing.T, budlets []*Budlet) budGoldenRecord {
380365 PreviousValue : hex .EncodeToString (budlet .PreviousValue ()),
381366 NotModifiedSince : strconv .FormatUint (budlet .NotModifiedSince (), 10 ),
382367 })
383- proof , found := tree .BuildBUDProof (budlet .Key ())
384- require .True (t , found )
368+ proof := mustNewBUDProof (t , budlets , budlet .Key ())
385369 record .Proofs = append (record .Proofs , hex .EncodeToString (proof .Serialize ()))
386370 }
387371 return record
0 commit comments