@@ -48,12 +48,16 @@ func basicRead(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
48
48
)
49
49
defer db .Close ()
50
50
51
- db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
51
+ if _ , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
52
52
for i := 0 ; i < len (data ); i ++ {
53
- op .AppendRaw ("a" , uint64 (i ), data [i ])
53
+ if err := op .AppendRaw ("a" , uint64 (i ), data [i ]); err != nil {
54
+ return err
55
+ }
54
56
}
55
57
return nil
56
- })
58
+ }); err != nil {
59
+ t .Fatalf ("Failed to write ancient data %v" , err )
60
+ }
57
61
db .TruncateTail (10 )
58
62
db .TruncateHead (90 )
59
63
@@ -109,12 +113,16 @@ func batchRead(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
109
113
)
110
114
defer db .Close ()
111
115
112
- db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
116
+ if _ , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
113
117
for i := 0 ; i < 100 ; i ++ {
114
- op .AppendRaw ("a" , uint64 (i ), data [i ])
118
+ if err := op .AppendRaw ("a" , uint64 (i ), data [i ]); err != nil {
119
+ return err
120
+ }
115
121
}
116
122
return nil
117
- })
123
+ }); err != nil {
124
+ t .Fatalf ("Failed to write ancient data %v" , err )
125
+ }
118
126
db .TruncateTail (10 )
119
127
db .TruncateHead (90 )
120
128
@@ -189,7 +197,9 @@ func basicWrite(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
189
197
// The ancient write to tables should be aligned
190
198
_ , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
191
199
for i := 0 ; i < 100 ; i ++ {
192
- op .AppendRaw ("a" , uint64 (i ), dataA [i ])
200
+ if err := op .AppendRaw ("a" , uint64 (i ), dataA [i ]); err != nil {
201
+ return err
202
+ }
193
203
}
194
204
return nil
195
205
})
@@ -200,8 +210,12 @@ func basicWrite(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
200
210
// Test normal ancient write
201
211
size , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
202
212
for i := 0 ; i < 100 ; i ++ {
203
- op .AppendRaw ("a" , uint64 (i ), dataA [i ])
204
- op .AppendRaw ("b" , uint64 (i ), dataB [i ])
213
+ if err := op .AppendRaw ("a" , uint64 (i ), dataA [i ]); err != nil {
214
+ return err
215
+ }
216
+ if err := op .AppendRaw ("b" , uint64 (i ), dataB [i ]); err != nil {
217
+ return err
218
+ }
205
219
}
206
220
return nil
207
221
})
@@ -217,8 +231,12 @@ func basicWrite(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
217
231
db .TruncateHead (90 )
218
232
_ , err = db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
219
233
for i := 90 ; i < 100 ; i ++ {
220
- op .AppendRaw ("a" , uint64 (i ), dataA [i ])
221
- op .AppendRaw ("b" , uint64 (i ), dataB [i ])
234
+ if err := op .AppendRaw ("a" , uint64 (i ), dataA [i ]); err != nil {
235
+ return err
236
+ }
237
+ if err := op .AppendRaw ("b" , uint64 (i ), dataB [i ]); err != nil {
238
+ return err
239
+ }
222
240
}
223
241
return nil
224
242
})
@@ -227,11 +245,15 @@ func basicWrite(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
227
245
}
228
246
229
247
// Write should work after truncating everything
230
- db .TruncateTail (0 )
248
+ db .TruncateHead (0 )
231
249
_ , err = db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
232
250
for i := 0 ; i < 100 ; i ++ {
233
- op .AppendRaw ("a" , uint64 (i ), dataA [i ])
234
- op .AppendRaw ("b" , uint64 (i ), dataB [i ])
251
+ if err := op .AppendRaw ("a" , uint64 (i ), dataA [i ]); err != nil {
252
+ return err
253
+ }
254
+ if err := op .AppendRaw ("b" , uint64 (i ), dataB [i ]); err != nil {
255
+ return err
256
+ }
235
257
}
236
258
return nil
237
259
})
@@ -245,14 +267,18 @@ func nonMutable(t *testing.T, newFn func(kinds []string) ethdb.AncientStore) {
245
267
defer db .Close ()
246
268
247
269
// We write 100 zero-bytes to the freezer and immediately mutate the slice
248
- db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
270
+ if _ , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
249
271
data := make ([]byte , 100 )
250
- op .AppendRaw ("a" , uint64 (0 ), data )
272
+ if err := op .AppendRaw ("a" , uint64 (0 ), data ); err != nil {
273
+ return err
274
+ }
251
275
for i := range data {
252
276
data [i ] = 0xff
253
277
}
254
278
return nil
255
- })
279
+ }); err != nil {
280
+ t .Fatalf ("Failed to write ancient data %v" , err )
281
+ }
256
282
// Now read it.
257
283
data , err := db .Ancient ("a" , uint64 (0 ))
258
284
if err != nil {
@@ -275,23 +301,31 @@ func TestResettableAncientSuite(t *testing.T, newFn func(kinds []string) ethdb.R
275
301
)
276
302
defer db .Close ()
277
303
278
- db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
304
+ if _ , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
279
305
for i := 0 ; i < 100 ; i ++ {
280
- op .AppendRaw ("a" , uint64 (i ), data [i ])
306
+ if err := op .AppendRaw ("a" , uint64 (i ), data [i ]); err != nil {
307
+ return err
308
+ }
281
309
}
282
310
return nil
283
- })
311
+ }); err != nil {
312
+ t .Fatalf ("Failed to write ancient data %v" , err )
313
+ }
284
314
db .TruncateTail (10 )
285
315
db .TruncateHead (90 )
286
316
287
317
// Ancient write should work after resetting
288
318
db .Reset ()
289
- db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
319
+ if _ , err := db .ModifyAncients (func (op ethdb.AncientWriteOp ) error {
290
320
for i := 0 ; i < 100 ; i ++ {
291
- op .AppendRaw ("a" , uint64 (i ), data [i ])
321
+ if err := op .AppendRaw ("a" , uint64 (i ), data [i ]); err != nil {
322
+ return err
323
+ }
292
324
}
293
325
return nil
294
- })
326
+ }); err != nil {
327
+ t .Fatalf ("Failed to write ancient data %v" , err )
328
+ }
295
329
})
296
330
}
297
331
0 commit comments