mirror of
https://github.com/codex-storage/nim-codex.git
synced 2025-01-09 20:45:38 +00:00
de88fd2c53
* implement a logging proxy The logging proxy: - prevents the need to import chronicles (as well as export except toJson), - prevents the need to override `writeValue` or use or import nim-json-seralization elsewhere in the codebase, allowing for sole use of utils/json for de/serialization, - and handles json formatting correctly in chronicles json sinks * Rename logging -> logutils to avoid ambiguity with common names * clean up * add setProperty for JsonRecord, remove nim-json-serialization conflict * Allow specifying textlines and json format separately Not specifying a LogFormat will apply the formatting to both textlines and json sinks. Specifying a LogFormat will apply the formatting to only that sink. * remove unneeded usages of std/json We only need to import utils/json instead of std/json * move serialization from rest/json to utils/json so it can be shared * fix NoColors ambiguity Was causing unit tests to fail on Windows. * Remove nre usage to fix Windows error Windows was erroring with `could not load: pcre64.dll`. Instead of fixing that error, remove the pcre usage :) * Add logutils module doc * Shorten logutils.formatIt for `NBytes` Both json and textlines formatIt were not needed, and could be combined into one formatIt * remove debug integration test config debug output and logformat of json for integration test logs * Use ## module doc to support docgen * bump nim-poseidon2 to export fromBytes Before the changes in this branch, fromBytes was likely being resolved by nim-stew, or other dependency. With the changes in this branch, that dependency was removed and fromBytes could no longer be resolved. By exporting fromBytes from nim-poseidon, the correct resolution is now happening. * fixes to get compiling after rebasing master * Add support for Result types being logged using formatIt
65 lines
1.9 KiB
Nim
65 lines
1.9 KiB
Nim
import pkg/questionable
|
|
import pkg/questionable/results
|
|
|
|
import ../../conf
|
|
import ../../logutils
|
|
import ../statemachine
|
|
import ../salesagent
|
|
import ./errorhandling
|
|
import ./errored
|
|
import ./cancelled
|
|
import ./failed
|
|
import ./proving
|
|
import ./provingsimulated
|
|
|
|
logScope:
|
|
topics = "marketplace sales filled"
|
|
|
|
type
|
|
SaleFilled* = ref object of ErrorHandlingState
|
|
HostMismatchError* = object of CatchableError
|
|
|
|
method onCancelled*(state: SaleFilled, request: StorageRequest): ?State =
|
|
return some State(SaleCancelled())
|
|
|
|
method onFailed*(state: SaleFilled, request: StorageRequest): ?State =
|
|
return some State(SaleFailed())
|
|
|
|
method `$`*(state: SaleFilled): string = "SaleFilled"
|
|
|
|
method run*(state: SaleFilled, machine: Machine): Future[?State] {.async.} =
|
|
let agent = SalesAgent(machine)
|
|
let data = agent.data
|
|
let context = agent.context
|
|
|
|
let market = context.market
|
|
let host = await market.getHost(data.requestId, data.slotIndex)
|
|
let me = await market.getSigner()
|
|
|
|
if host == me.some:
|
|
info "Slot succesfully filled", requestId = data.requestId, slotIndex = data.slotIndex
|
|
|
|
without request =? data.request:
|
|
raiseAssert "no sale request"
|
|
|
|
if onFilled =? agent.onFilled:
|
|
onFilled(request, data.slotIndex)
|
|
|
|
without onExpiryUpdate =? context.onExpiryUpdate:
|
|
raiseAssert "onExpiryUpdate callback not set"
|
|
|
|
let requestEnd = await market.getRequestEnd(data.requestId)
|
|
if err =? (await onExpiryUpdate(request.content.cid, requestEnd)).errorOption:
|
|
return some State(SaleErrored(error: err))
|
|
|
|
when codex_enable_proof_failures:
|
|
if context.simulateProofFailures > 0:
|
|
info "Proving with failure rate", rate = context.simulateProofFailures
|
|
return some State(SaleProvingSimulated(failEveryNProofs: context.simulateProofFailures))
|
|
|
|
return some State(SaleProving())
|
|
|
|
else:
|
|
let error = newException(HostMismatchError, "Slot filled by other host")
|
|
return some State(SaleErrored(error: error))
|