mirror of
https://github.com/status-im/nim-dagger.git
synced 2025-01-10 14:46:03 +00:00
d56eb6aee1
* [contracts] Add SlotFreed event * [integration] allow test node to be stopped twice * [cli] add --validator option * [contracts] remove dead code * [contracts] instantiate OnChainMarket and OnChainClock only once * [contracts] add Validation * [sales] remove duplicate import * [market] add missing import * [market] subscribe to all SlotFilled events * [market] add freeSlot() * [sales] fix warnings * [market] subscribe to SlotFreed events * [contracts] fix warning * [validator] keep track of filled slots * [validation] remove slots that have ended * [proving] absorb Proofs into Market Both Proofs and Market are abstractions around the Marketplace contract, having them separately is more trouble than it's worth at the moment. * [market] add markProofAsMissing() * [clock] speed up waiting for clock in tests * [validator] mark proofs as missing * [timer] fix error on node shutdown * [cli] handle --persistence and --validator separately * [market] allow retrieval of proof timeout value * [validator] do not subscribe to SlotFreed events Freed slots are already handled in removeSlotsThatHaveEnded(), and onSlotsFreed() interfered with its iterator. * [validator] Start validation at the start of a new period To decrease the likelihood that we hit the validation timeout. * [validator] do not mark proofs as missing after timeout * [market] check whether proof can be marked as missing * [validator] simplify validation Simulate a transaction to mark proof as missing, instead of trying to keep track of all the conditions that may lead to a proof being marked as missing. * [build] use nim-ethers PR #40 Uses "pending" blocktag instead of "latest" blocktag for better simulation of transactions before sending them. https://github.com/status-im/nim-ethers/pull/40 * [integration] integration test for validator * [validator] monitor a maximum number of slots Adds cli parameter --validator-max-slots. * [market] fix missing collateral argument After rebasing, add the new argument to fillSlot calls. * [build] update to nim-ethers 0.2.5 * [validator] use Set instead of Table to keep track of slots * [validator] add logging * [validator] add test for slot failure * [market] use "pending" blocktag to use more up to date block time * [contracts] remove unused import * [validator] fix: wait until after period ends The smart contract checks that 'end < block.timestamp', so we need to wait until the block timestamp is greater than the period end.
125 lines
3.7 KiB
Nim
125 lines
3.7 KiB
Nim
import pkg/asynctest
|
|
import pkg/chronos
|
|
import pkg/codex/proving
|
|
import ./helpers/mockmarket
|
|
import ./helpers/mockclock
|
|
import ./helpers/eventually
|
|
import ./examples
|
|
|
|
suite "Proving":
|
|
|
|
var proving: Proving
|
|
var market: MockMarket
|
|
var clock: MockClock
|
|
|
|
setup:
|
|
market = MockMarket.new()
|
|
clock = MockClock.new()
|
|
proving = Proving.new(market, clock)
|
|
await proving.start()
|
|
|
|
teardown:
|
|
await proving.stop()
|
|
|
|
proc advanceToNextPeriod(market: MockMarket) {.async.} =
|
|
let periodicity = await market.periodicity()
|
|
clock.advance(periodicity.seconds.truncate(int64))
|
|
|
|
test "maintains a list of slots to watch":
|
|
let slot1, slot2 = Slot.example
|
|
check proving.slots.len == 0
|
|
proving.add(slot1)
|
|
check proving.slots.contains(slot1)
|
|
proving.add(slot2)
|
|
check proving.slots.contains(slot1)
|
|
check proving.slots.contains(slot2)
|
|
|
|
test "removes duplicate slots":
|
|
let slot = Slot.example
|
|
proving.add(slot)
|
|
proving.add(slot)
|
|
check proving.slots.len == 1
|
|
|
|
test "invokes callback when proof is required":
|
|
let slot = Slot.example
|
|
proving.add(slot)
|
|
var called: bool
|
|
proc onProve(slot: Slot): Future[seq[byte]] {.async.} =
|
|
called = true
|
|
proving.onProve = onProve
|
|
market.slotState[slot.id] = SlotState.Filled
|
|
market.setProofRequired(slot.id, true)
|
|
await market.advanceToNextPeriod()
|
|
check eventually called
|
|
|
|
test "callback receives slot for which proof is required":
|
|
let slot1, slot2 = Slot.example
|
|
proving.add(slot1)
|
|
proving.add(slot2)
|
|
var callbackSlots: seq[Slot]
|
|
proc onProve(slot: Slot): Future[seq[byte]] {.async.} =
|
|
callbackSlots.add(slot)
|
|
proving.onProve = onProve
|
|
market.slotState[slot1.id] = SlotState.Filled
|
|
market.slotState[slot2.id] = SlotState.Filled
|
|
market.setProofRequired(slot1.id, true)
|
|
await market.advanceToNextPeriod()
|
|
check eventually callbackSlots == @[slot1]
|
|
market.setProofRequired(slot1.id, false)
|
|
market.setProofRequired(slot2.id, true)
|
|
await market.advanceToNextPeriod()
|
|
check eventually callbackSlots == @[slot1, slot2]
|
|
|
|
test "invokes callback when proof is about to be required":
|
|
let slot = Slot.example
|
|
proving.add(slot)
|
|
var called: bool
|
|
proc onProve(slot: Slot): Future[seq[byte]] {.async.} =
|
|
called = true
|
|
proving.onProve = onProve
|
|
market.setProofRequired(slot.id, false)
|
|
market.setProofToBeRequired(slot.id, true)
|
|
market.slotState[slot.id] = SlotState.Filled
|
|
await market.advanceToNextPeriod()
|
|
check eventually called
|
|
|
|
test "stops watching when slot is finished":
|
|
let slot = Slot.example
|
|
proving.add(slot)
|
|
market.setProofEnd(slot.id, clock.now().u256)
|
|
await market.advanceToNextPeriod()
|
|
var called: bool
|
|
proc onProve(slot: Slot): Future[seq[byte]] {.async.} =
|
|
called = true
|
|
proving.onProve = onProve
|
|
market.setProofRequired(slot.id, true)
|
|
await market.advanceToNextPeriod()
|
|
market.slotState[slot.id] = SlotState.Finished
|
|
check eventually (not proving.slots.contains(slot))
|
|
check not called
|
|
|
|
test "submits proofs":
|
|
let slot = Slot.example
|
|
let proof = exampleProof()
|
|
|
|
proving.onProve = proc (slot: Slot): Future[seq[byte]] {.async.} =
|
|
return proof
|
|
|
|
var receivedIds: seq[SlotId]
|
|
var receivedProofs: seq[seq[byte]]
|
|
|
|
proc onProofSubmission(id: SlotId, proof: seq[byte]) =
|
|
receivedIds.add(id)
|
|
receivedProofs.add(proof)
|
|
|
|
let subscription = await proving.subscribeProofSubmission(onProofSubmission)
|
|
|
|
proving.add(slot)
|
|
market.slotState[slot.id] = SlotState.Filled
|
|
market.setProofRequired(slot.id, true)
|
|
await market.advanceToNextPeriod()
|
|
|
|
check eventually receivedIds == @[slot.id] and receivedProofs == @[proof]
|
|
|
|
await subscription.unsubscribe()
|