mirror of
https://github.com/status-im/nim-dagger.git
synced 2025-01-15 17:24:32 +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
94 lines
3.3 KiB
Nim
94 lines
3.3 KiB
Nim
import pkg/chronos
|
|
import pkg/ethers/testing
|
|
import pkg/ethers/erc20
|
|
import codex/contracts
|
|
import ../ethertest
|
|
import ./examples
|
|
import ./time
|
|
import ./deployment
|
|
|
|
ethersuite "Marketplace contracts":
|
|
let proof = exampleProof()
|
|
|
|
var client, host: Signer
|
|
var marketplace: Marketplace
|
|
var token: Erc20Token
|
|
var periodicity: Periodicity
|
|
var request: StorageRequest
|
|
var slotId: SlotId
|
|
|
|
proc switchAccount(account: Signer) =
|
|
marketplace = marketplace.connect(account)
|
|
token = token.connect(account)
|
|
|
|
setup:
|
|
client = ethProvider.getSigner(accounts[0])
|
|
host = ethProvider.getSigner(accounts[1])
|
|
|
|
marketplace = Marketplace.new(Marketplace.address, ethProvider.getSigner())
|
|
|
|
let tokenAddress = await marketplace.token()
|
|
token = Erc20Token.new(tokenAddress, ethProvider.getSigner())
|
|
|
|
let config = await marketplace.config()
|
|
periodicity = Periodicity(seconds: config.proofs.period)
|
|
|
|
request = StorageRequest.example
|
|
request.client = await client.getAddress()
|
|
|
|
switchAccount(client)
|
|
discard await token.approve(marketplace.address, request.price)
|
|
await marketplace.requestStorage(request)
|
|
switchAccount(host)
|
|
discard await token.approve(marketplace.address, request.ask.collateral)
|
|
await marketplace.fillSlot(request.id, 0.u256, proof)
|
|
slotId = request.slotId(0.u256)
|
|
|
|
proc waitUntilProofRequired(slotId: SlotId) {.async.} =
|
|
let currentPeriod = periodicity.periodOf(await ethProvider.currentTime())
|
|
await ethProvider.advanceTimeTo(periodicity.periodEnd(currentPeriod))
|
|
while not (
|
|
(await marketplace.isProofRequired(slotId)) and
|
|
(await marketplace.getPointer(slotId)) < 250
|
|
):
|
|
await ethProvider.advanceTime(periodicity.seconds)
|
|
|
|
proc startContract() {.async.} =
|
|
for slotIndex in 1..<request.ask.slots:
|
|
discard await token.approve(marketplace.address, request.ask.collateral)
|
|
await marketplace.fillSlot(request.id, slotIndex.u256, proof)
|
|
|
|
test "accept marketplace proofs":
|
|
switchAccount(host)
|
|
await waitUntilProofRequired(slotId)
|
|
await marketplace.submitProof(slotId, proof)
|
|
|
|
test "can mark missing proofs":
|
|
switchAccount(host)
|
|
await waitUntilProofRequired(slotId)
|
|
let missingPeriod = periodicity.periodOf(await ethProvider.currentTime())
|
|
let endOfPeriod = periodicity.periodEnd(missingPeriod)
|
|
await ethProvider.advanceTimeTo(endOfPeriod + 1)
|
|
switchAccount(client)
|
|
await marketplace.markProofAsMissing(slotId, missingPeriod)
|
|
|
|
test "can be paid out at the end":
|
|
switchAccount(host)
|
|
let address = await host.getAddress()
|
|
await startContract()
|
|
let requestEnd = await marketplace.requestEnd(request.id)
|
|
await ethProvider.advanceTimeTo(requestEnd.u256 + 1)
|
|
let startBalance = await token.balanceOf(address)
|
|
await marketplace.freeSlot(slotId)
|
|
let endBalance = await token.balanceOf(address)
|
|
check endBalance == (startBalance + request.ask.duration * request.ask.reward + request.ask.collateral)
|
|
|
|
test "cannot mark proofs missing for cancelled request":
|
|
await ethProvider.advanceTimeTo(request.expiry + 1)
|
|
switchAccount(client)
|
|
let missingPeriod = periodicity.periodOf(await ethProvider.currentTime())
|
|
await ethProvider.advanceTime(periodicity.seconds)
|
|
check await marketplace
|
|
.markProofAsMissing(slotId, missingPeriod)
|
|
.reverts("Slot not accepting proofs")
|