mirror of
https://github.com/status-im/nim-codex.git
synced 2025-01-09 18:36:29 +00:00
4175689745
* [purchasing] Simplify test * [utils] Move StorageRequest.example up one level * [purchasing] Load purchases from market * [purchasing] load purchase states * Implement myRequest() and getState() methods for OnChainMarket * [proofs] Fix intermittently failing tests Ensures that examples of proofs in tests are never of length 0; these are considered invalid proofs by the smart contract logic. * [contracts] Fix failing test With the new solidity contracts update, a contract can only be paid out after it started. * [market] Add method to get request end time * [purchasing] wait until purchase is finished Purchase.wait() would previously wait until purchase was started, now we wait until it is finished. * [purchasing] Handle 'finished' and 'failed' states * [marketplace] move to failed state once request fails - Add support for subscribing to request failure events. - Add supporting contract tests for subscribing to request failure events. - Allow the PurchaseStarted state to move to PurchaseFailure once a request failure event is emitted - Add supporting tests for moving from PurchaseStarted to PurchaseFailure - Add state transition tests for PurchaseUnknown. * [marketplace] Fix test with longer sleepAsync * [integration] Add function to restart a codex node * [purchasing] Set client address before requesting storage To prevent the purchase id (which equals the request id) from changing once it's been submitted. * [contracts] Fix: OnChainMarket.getState() Had the wrong method signature before * [purchasing] Load purchases on node start * [purchasing] Rename state 'PurchaseError' to 'PurchaseErrored' Allows for an exception type called 'PurchaseError' * [purchasing] Load purchases in background No longer calls market.getRequest() for every purchase on node start. * [contracts] Add `$` for RequestId, SlotId and Nonce To aid with debugging * [purchasing] Add Purchasing.stop() To ensure that all contract interactions have both a start() and a stop() for * [tests] Remove sleepAsync where possible Use `eventually` loop instead, to make sure that we're not waiting unnecessarily. * [integration] Fix: handle non-json response in test * [purchasing] Add purchase state to json * [integration] Ensure that purchase is submitted before restart Fixes test failure on slower CI * [purchasing] re-implement `description` as method Allows description to be set in the same module where the state type is defined. Co-authored-by: Eric Mastro <eric.mastro@gmail.com> * [contracts] fix typo Co-authored-by: Eric Mastro <eric.mastro@gmail.com> * [market] Use more generic error type Should we decide to change the provider type later Co-authored-by: Eric Mastro <eric.mastro@gmail.com> Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
66 lines
2.1 KiB
Nim
66 lines
2.1 KiB
Nim
import ./statemachine
|
|
import ./states/pending
|
|
import ./states/unknown
|
|
import ./purchaseid
|
|
|
|
# Purchase is implemented as a state machine.
|
|
#
|
|
# It can either be a new (pending) purchase that still needs to be submitted
|
|
# on-chain, or it is a purchase that was previously submitted on-chain, and
|
|
# we're just restoring its (unknown) state after a node restart.
|
|
#
|
|
# |
|
|
# v
|
|
# ------------------------- unknown
|
|
# | / /
|
|
# v v /
|
|
# pending ----> submitted ----> started ---------> finished <----/
|
|
# \ \ /
|
|
# \ ------------> failed <----/
|
|
# \ /
|
|
# --> cancelled <-----------------------
|
|
|
|
export Purchase
|
|
export purchaseid
|
|
export statemachine
|
|
|
|
func new*(_: type Purchase,
|
|
requestId: RequestId,
|
|
market: Market,
|
|
clock: Clock): Purchase =
|
|
Purchase(
|
|
future: Future[void].new(),
|
|
requestId: requestId,
|
|
market: market,
|
|
clock: clock
|
|
)
|
|
|
|
func new*(_: type Purchase,
|
|
request: StorageRequest,
|
|
market: Market,
|
|
clock: Clock): Purchase =
|
|
let purchase = Purchase.new(request.id, market, clock)
|
|
purchase.request = some request
|
|
return purchase
|
|
|
|
proc start*(purchase: Purchase) =
|
|
purchase.switch(PurchasePending())
|
|
|
|
proc load*(purchase: Purchase) =
|
|
purchase.switch(PurchaseUnknown())
|
|
|
|
proc wait*(purchase: Purchase) {.async.} =
|
|
await purchase.future
|
|
|
|
func id*(purchase: Purchase): PurchaseId =
|
|
PurchaseId(purchase.requestId)
|
|
|
|
func finished*(purchase: Purchase): bool =
|
|
purchase.future.finished
|
|
|
|
func error*(purchase: Purchase): ?(ref CatchableError) =
|
|
if purchase.future.failed:
|
|
some purchase.future.error
|
|
else:
|
|
none (ref CatchableError)
|