diff --git a/codex/sales.nim b/codex/sales.nim index 40a0fc1d..3150a158 100644 --- a/codex/sales.nim +++ b/codex/sales.nim @@ -160,7 +160,7 @@ proc cleanUp( var seenItem = SlotQueueItem.init( data.requestId, data.slotIndex.truncate(uint16), - request.ask, + data.ask, request.expiry, seen = true, collateralPerSlot = collateralPerSlot, @@ -346,11 +346,7 @@ proc onSlotFreed(sales: Sales, requestId: RequestId, slotIndex: UInt256) = let collateralPerSlot = await market.slotCollateral(request.id, slotIndex) slotQueueItem = SlotQueueItem.init( - request.id, - slotIndex.truncate(uint16), - request.ask, - request.expiry, - collateralPerSlot = collateralPerSlot, + request, slotIndex.truncate(uint16), collateralPerSlot = collateralPerSlot ) if err =? queue.push(slotQueueItem).errorOption: diff --git a/codex/sales/slotqueue.nim b/codex/sales/slotqueue.nim index 8c19e4cb..030626e3 100644 --- a/codex/sales/slotqueue.nim +++ b/codex/sales/slotqueue.nim @@ -151,9 +151,18 @@ proc init*( ) proc init*( - _: type SlotQueueItem, request: StorageRequest, slotIndex: uint16 + _: type SlotQueueItem, + request: StorageRequest, + slotIndex: uint16, + collateralPerSlot: UInt256 = 0.u256, ): SlotQueueItem = - SlotQueueItem.init(request.id, slotIndex, request.ask, request.expiry) + SlotQueueItem.init( + request.id, + slotIndex, + request.ask, + request.expiry, + collateralPerSlot = collateralPerSlot, + ) proc init*( _: type SlotQueueItem, requestId: RequestId, ask: StorageAsk, expiry: UInt256 diff --git a/tests/codex/sales/testslotqueue.nim b/tests/codex/sales/testslotqueue.nim index 42babb33..74aad342 100644 --- a/tests/codex/sales/testslotqueue.nim +++ b/tests/codex/sales/testslotqueue.nim @@ -432,11 +432,7 @@ suite "Slot queue": var request = StorageRequest.example let item0 = SlotQueueItem.init(request, 0) let item1 = SlotQueueItem.init( - request.id, - 1.uint16, - request.ask, - request.expiry, - collateralPerSlot = request.ask.collateralPerSlot + 1.u256, + request, 1, collateralPerSlot = request.ask.collateralPerSlot + 1.u256 ) check item1 > item0