rename bulk.DiscardLast() -> bulk.Discard()

aergoio · Jul 8, 2024 · 4d1f1d0 · 4d1f1d0
1 parent cd5d34a
commit 4d1f1d0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/chain/chaindb.go b/chain/chaindb.go
@@ -389,7 +389,7 @@ func (cdb *ChainDB) swapChainMapping(newBlocks []*types.Block) error {
 	var blockIdx []byte
 
 	bulk := cdb.store.NewBulk()
-	defer bulk.DiscardLast()
+	defer bulk.Discard()
 
 	//make newTx because of batchsize limit of DB
 	for i := len(newBlocks) - 1; i >= 0; i-- {

diff --git a/chain/chaindbForRaft.go b/chain/chaindbForRaft.go
@@ -82,7 +82,7 @@ func (cdb *ChainDB) ClearWAL() {
 		logger.Debug().Uint64("last", lastIdx).Msg("reset raft entries from datafiles")
 
 		bulk := cdb.store.NewBulk()
-		defer bulk.DiscardLast()
+		defer bulk.Discard()
 
 		for i := lastIdx; i >= 1; i-- {
 			bulk.Delete(dbkey.RaftEntry(i))

diff --git a/chain/recover.go b/chain/recover.go
@@ -161,7 +161,7 @@ func (rm *ReorgMarker) RecoverChainMapping(cdb *ChainDB) error {
 	}
 
 	bulk := cdb.store.NewBulk()
-	defer bulk.DiscardLast()
+	defer bulk.Discard()
 
 	var tmpBlkNo types.BlockNo
 	var tmpBlk *types.Block

diff --git a/chain/reorg.go b/chain/reorg.go
@@ -334,7 +334,7 @@ func (reorg *reorganizer) swapTxMapping() error {
 
 	// delete old tx mapping
 	bulk := cdb.store.NewBulk()
-	defer bulk.DiscardLast()
+	defer bulk.Discard()
 
 	for _, oldTx := range oldTxs {
 		bulk.Delete(oldTx.Hash)

diff --git a/state/statedb/statedb.go b/state/statedb/statedb.go
@@ -364,12 +364,12 @@ func (states *StateDB) Commit() error {
 	for _, storage := range states.Cache.storages {
 		// stage changes
 		if err := storage.stage(bulk); err != nil {
-			bulk.DiscardLast()
+			bulk.Discard()
 			return err
 		}
 	}
 	if err := states.stage(bulk); err != nil {
-		bulk.DiscardLast()
+		bulk.Discard()
 		return err
 	}
 	bulk.Flush()