Fix close not being called for iterators (dydxprotocol#1891)

skip-mev · Jul 11, 2024 · dbedbd7 · dbedbd7
1 parent db2dcfd
commit dbedbd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/protocol/x/clob/keeper/process_proposer_matches_events.go b/protocol/x/clob/keeper/process_proposer_matches_events.go
@@ -144,6 +144,7 @@ func (k Keeper) ResetOrderedOrderIds(
 ) {
 	prefixStore := prefix.NewStore(store, []byte(keyPrefix))
 	it := prefixStore.Iterator(nil, nil)
+	defer it.Close()
 	for ; it.Valid(); it.Next() {
 		prefixStore.Delete(it.Key())
 	}
@@ -153,6 +154,7 @@ func (k Keeper) ResetOrderedOrderIds(
 func (k Keeper) ResetUnorderedOrderIds(ctx sdk.Context, store storetypes.KVStore, keyPrefix string) {
 	prefixStore := prefix.NewStore(store, []byte(keyPrefix))
 	it := prefixStore.Iterator(nil, nil)
+	defer it.Close()
 	for ; it.Valid(); it.Next() {
 		prefixStore.Delete(it.Key())
 	}
@@ -186,6 +188,7 @@ func (k Keeper) GetOrderIds(
 	ret := []types.OrderId{}
 	prefixStore := prefix.NewStore(store, []byte(keyPrefix))
 	it := prefixStore.Iterator(nil, nil)
+	defer it.Close()
 	for ; it.Valid(); it.Next() {
 		var orderId types.OrderId
 		k.cdc.MustUnmarshal(it.Value(), &orderId)

diff --git a/protocol/x/clob/keeper/stateful_order_state.go b/protocol/x/clob/keeper/stateful_order_state.go
@@ -230,6 +230,7 @@ func (k Keeper) RemoveExpiredStatefulOrders(ctx sdk.Context, blockTime time.Time
 			[]byte(fmt.Sprintf(types.StatefulOrdersExpirationsKeyPrefix, sdk.FormatTimeString(blockTime))),
 		),
 	)
+	defer it.Close()
 	for ; it.Valid(); it.Next() {
 		var orderId types.OrderId
 		k.cdc.MustUnmarshal(it.Value(), &orderId)