2024-01-17 19:24:34 +00:00
|
|
|
import pkg/questionable/results
|
feat: create logging proxy (#663)
* 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
2024-01-23 07:35:03 +00:00
|
|
|
import ../../logutils
|
2023-08-21 10:26:43 +00:00
|
|
|
import ../statemachine
|
|
|
|
import ../salesagent
|
|
|
|
import ./errorhandling
|
|
|
|
import ./filling
|
|
|
|
import ./cancelled
|
2024-01-17 19:24:34 +00:00
|
|
|
import ./errored
|
2023-08-21 10:26:43 +00:00
|
|
|
import ./failed
|
|
|
|
|
|
|
|
logScope:
|
2023-10-19 08:12:49 +00:00
|
|
|
topics = "marketplace sales initial-proving"
|
2023-08-21 10:26:43 +00:00
|
|
|
|
|
|
|
type
|
|
|
|
SaleInitialProving* = ref object of ErrorHandlingState
|
|
|
|
|
|
|
|
method `$`*(state: SaleInitialProving): string = "SaleInitialProving"
|
|
|
|
|
|
|
|
method onCancelled*(state: SaleInitialProving, request: StorageRequest): ?State =
|
|
|
|
return some State(SaleCancelled())
|
|
|
|
|
|
|
|
method onFailed*(state: SaleInitialProving, request: StorageRequest): ?State =
|
|
|
|
return some State(SaleFailed())
|
|
|
|
|
|
|
|
method run*(state: SaleInitialProving, machine: Machine): Future[?State] {.async.} =
|
|
|
|
let data = SalesAgent(machine).data
|
|
|
|
let context = SalesAgent(machine).context
|
|
|
|
|
|
|
|
without request =? data.request:
|
|
|
|
raiseAssert "no sale request"
|
|
|
|
|
|
|
|
without onProve =? context.onProve:
|
|
|
|
raiseAssert "onProve callback not set"
|
|
|
|
|
feat: create logging proxy (#663)
* 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
2024-01-23 07:35:03 +00:00
|
|
|
debug "Generating initial proof", requestId = data.requestId
|
2023-12-11 10:29:15 +00:00
|
|
|
let
|
|
|
|
slot = Slot(request: request, slotIndex: data.slotIndex)
|
|
|
|
challenge = await context.market.getChallenge(slot.id)
|
2024-01-17 19:24:34 +00:00
|
|
|
without proof =? (await onProve(slot, challenge)), err:
|
|
|
|
error "Failed to generate initial proof", error = err.msg
|
|
|
|
return some State(SaleErrored(error: err))
|
|
|
|
|
feat: create logging proxy (#663)
* 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
2024-01-23 07:35:03 +00:00
|
|
|
debug "Finished proof calculation", requestId = data.requestId
|
2023-08-21 10:26:43 +00:00
|
|
|
|
|
|
|
return some State(SaleFilling(proof: proof))
|