@@ -192,15 +192,15 @@ func (vm *VM) Initialize(
192
192
}
193
193
194
194
if err := vm .repairAcceptedChainByHeight (ctx ); err != nil {
195
- return err
195
+ return fmt . Errorf ( "failed to repair accepted chain by height: %w" , err )
196
196
}
197
197
198
198
if err := vm .setLastAcceptedMetadata (ctx ); err != nil {
199
- return err
199
+ return fmt . Errorf ( "failed to set last accepted metadata: %w" , err )
200
200
}
201
201
202
202
if err := vm .pruneOldBlocks (); err != nil {
203
- return err
203
+ return fmt . Errorf ( "failed to prune old blocks: %w" , err )
204
204
}
205
205
206
206
forkHeight , err := vm .GetForkHeight ()
@@ -216,7 +216,7 @@ func (vm *VM) Initialize(
216
216
zap .String ("state" , "before fork" ),
217
217
)
218
218
default :
219
- return err
219
+ return fmt . Errorf ( "failed to get fork height: %w" , err )
220
220
}
221
221
222
222
vm .proposerBuildSlotGauge = prometheus .NewGauge (prometheus.GaugeOpts {
@@ -278,7 +278,7 @@ func (vm *VM) SetState(ctx context.Context, newState snow.State) error {
278
278
// accepted block. If state sync has completed successfully, this call is a
279
279
// no-op.
280
280
if err := vm .repairAcceptedChainByHeight (ctx ); err != nil {
281
- return err
281
+ return fmt . Errorf ( "failed to repair accepted chain height: %w" , err )
282
282
}
283
283
return vm .setLastAcceptedMetadata (ctx )
284
284
}
@@ -443,11 +443,11 @@ func (vm *VM) LastAccepted(ctx context.Context) (ids.ID, error) {
443
443
func (vm * VM ) repairAcceptedChainByHeight (ctx context.Context ) error {
444
444
innerLastAcceptedID , err := vm .ChainVM .LastAccepted (ctx )
445
445
if err != nil {
446
- return err
446
+ return fmt . Errorf ( "failed to get inner last accepted: %w" , err )
447
447
}
448
448
innerLastAccepted , err := vm .ChainVM .GetBlock (ctx , innerLastAcceptedID )
449
449
if err != nil {
450
- return err
450
+ return fmt . Errorf ( "failed to get inner last accepted block: %w" , err )
451
451
}
452
452
proLastAcceptedID , err := vm .State .GetLastAccepted ()
453
453
if err == database .ErrNotFound {
@@ -456,11 +456,11 @@ func (vm *VM) repairAcceptedChainByHeight(ctx context.Context) error {
456
456
return nil
457
457
}
458
458
if err != nil {
459
- return err
459
+ return fmt . Errorf ( "failed to get last accepted: %w" , err )
460
460
}
461
461
proLastAccepted , err := vm .getPostForkBlock (ctx , proLastAcceptedID )
462
462
if err != nil {
463
- return err
463
+ return fmt . Errorf ( "failed to get last accepted block: %w" , err )
464
464
}
465
465
466
466
proLastAcceptedHeight := proLastAccepted .Height ()
@@ -482,14 +482,14 @@ func (vm *VM) repairAcceptedChainByHeight(ctx context.Context) error {
482
482
// proposervm back.
483
483
forkHeight , err := vm .State .GetForkHeight ()
484
484
if err != nil {
485
- return err
485
+ return fmt . Errorf ( "failed to get fork height: %w" , err )
486
486
}
487
487
488
488
if forkHeight > innerLastAcceptedHeight {
489
489
// We are rolling back past the fork, so we should just forget about all
490
490
// of our proposervm indices.
491
491
if err := vm .State .DeleteLastAccepted (); err != nil {
492
- return err
492
+ return fmt . Errorf ( "failed to delete last accepted: %w" , err )
493
493
}
494
494
return vm .db .Commit ()
495
495
}
@@ -503,9 +503,14 @@ func (vm *VM) repairAcceptedChainByHeight(ctx context.Context) error {
503
503
}
504
504
505
505
if err := vm .State .SetLastAccepted (newProLastAcceptedID ); err != nil {
506
- return err
506
+ return fmt . Errorf ( "failed to set last accepted: %w" , err )
507
507
}
508
- return vm .db .Commit ()
508
+
509
+ if err := vm .db .Commit (); err != nil {
510
+ return fmt .Errorf ("failed to commit db: %w" , err )
511
+ }
512
+
513
+ return nil
509
514
}
510
515
511
516
func (vm * VM ) setLastAcceptedMetadata (ctx context.Context ) error {
0 commit comments