delete height index

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

Author: joshua-kim

vms/avm/state.go

@@ -161,7 +161,7 @@ func (g *gForkStateMigration) Migrate(
 
 	lastMigratedUTXO, _, err := next.getLastMigratedUTXO()
 	if err != nil {
-		return nil, fmt.Errorf("failed to get last migrated UTXO: %w", err)
+		return nil, fmt.Errorf("failed to get last migrated utxo: %w", err)
 	}
 
 	for utxo, err := range prevState.UTXOs(lastMigratedUTXO) {
@@ -172,7 +172,7 @@ func (g *gForkStateMigration) Migrate(
 		next.AddUTXO(utxo)
 		utxoID := utxo.InputID()
 		if err := prevUTXODB.Delete(utxoID[:]); err != nil {
-			return nil, fmt.Errorf("failed to delete utxo: %w", err)
+			return nil, fmt.Errorf("failed to delete migrated utxo: %w", err)
 		}
 
 		if err := next.putLastMigratedUTXO(utxo.InputID()); err != nil {
@@ -201,7 +201,7 @@ func (g *gForkStateMigration) Migrate(
 		}
 
 		if err := prevTXDB.Delete(itr.Key()); err != nil {
-			return nil, fmt.Errorf("failed to migrate tx: %w", err)
+			return nil, fmt.Errorf("failed to delete migrated tx: %w", err)
 		}
 
 		if err := g.commit(baseDB); err != nil {
@@ -244,15 +244,17 @@ func (g *gForkStateMigration) Migrate(
 	}
 
 	if ok {
-		// TODO skips
 		startingBlkHeightKey = database.PackUInt64(lastMigratedBlkHeight)
 	}
 
-	//TODO check that this is migrated
 	for itr := prevBlockIDDB.NewIteratorWithStart(startingBlkHeightKey); itr.Next(); {
 		if err := next.state.BlockIDDB.Put(itr.Key(), itr.Value()); err != nil {
 			return nil, fmt.Errorf("failed to migrate block height: %w", err)
 		}
+
+		if err := prevBlockIDDB.Delete(itr.Key()); err != nil {
+			return nil, fmt.Errorf("failed to delete migrated block height: %w", err)
+		}
 	}
 
 	g.log.Debug("migrating singletons")

vms/avm/vm_test.go

@@ -904,7 +904,7 @@ func TestVMLinearizeStateMigration(t *testing.T) {
 		require.ErrorIs(err, database.ErrNotFound)
 
 		_, err = vm.GetBlockIDAtHeight(context.Background(), itr.Value())
-		require.NoError(err, database.ErrNotFound)
+		require.ErrorIs(err, database.ErrNotFound)
 	}
 
 	for _, txID := range wantTxs {