Mark Spanbroek
5f1da8c59a
[build] Allow model checking with solidity compiler
2023-01-25 12:00:19 +01:00
Eric Mastro
cde5436262
get request from slot id ( #34 )
...
* get request from slot id
- Add public function to get request from slot id.
- Add chai test assertion that compares requests. Usage: `expect(await marketplace.getRequestFromSlotId(slotId(slot))).to.be.request(request)`
This is used when restoring active sales, and a node calls `mySlots`, then iterates the slots and needs originating request details.
* merge upstream changes
2023-01-24 15:59:56 +11:00
Mark Spanbroek
be38c54622
[style] enforce `_` prefix for private names
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-23 15:10:23 +01:00
Mark Spanbroek
b81e6e6532
[marketplace] better wording
...
Avoids the word 'expired' which is associated
with cancelling a request
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-23 15:10:23 +01:00
Mark Spanbroek
b3855c4ba3
[style] Use _ for private and internal functions
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-23 15:10:23 +01:00
Mark Spanbroek
3bb077db7a
[marketplace] reordering
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-23 15:10:23 +01:00
Mark Spanbroek
019c1c34c0
[marketplace] rewrite slot freeing test
...
To make it independent of values chosen in exampleRequest().
Uses the recently introduced slotState().
2023-01-23 15:10:23 +01:00
Mark Spanbroek
b62eeb564a
[marketplace] test & fix slotState()
2023-01-23 15:10:23 +01:00
Mark Spanbroek
70d8967f26
[deployment] use new configuration struct
2023-01-23 15:10:23 +01:00
Mark Spanbroek
334da1144d
[marketplace] renaming and reshuffling of request state test
2023-01-23 15:10:23 +01:00
Mark Spanbroek
ae70fd7c6f
[marketplace] introduce MarketplaceConfiguration struct
...
Container for all configuration values, replaces separate
constructor parameters and getters.
2023-01-23 15:10:23 +01:00
Mark Spanbroek
91ccc82d49
[proofs] remove dead code
2023-01-23 15:10:23 +01:00
Mark Spanbroek
bd284acce3
[examples] remove dead code
2023-01-23 15:10:23 +01:00
Mark Spanbroek
2dbdd0028d
[marketplace] move price calculations to Requests.sol
2023-01-23 15:10:23 +01:00
Mark Spanbroek
7aa162b526
[marketplace] move proofPeriod() getter to Proofs.sol
2023-01-23 15:10:23 +01:00
Mark Spanbroek
8c6891f1e2
[marketplace] slotIsNotFree() modifier
...
Replaces _slot getter
2023-01-23 15:10:23 +01:00
Mark Spanbroek
944e9c9da2
[marketplace] requestIsKnown() modifier
...
Replaces _request() getter
2023-01-23 15:10:23 +01:00
Mark Spanbroek
6eab9fee9a
[marketplace] remove wrappers around proof functions
...
No longer required; slot state is checked in Proofs.sol
2023-01-23 15:10:23 +01:00
Mark Spanbroek
55ef97687e
[proofs] Remove outdated comment
2023-01-23 15:10:23 +01:00
Mark Spanbroek
97af6f7484
[marketplace] remove dead code
2023-01-23 15:10:23 +01:00
Mark Spanbroek
32b137a427
[marketplace] inline _context()
2023-01-23 15:10:23 +01:00
Mark Spanbroek
e828529e90
[marketplace] inline the requestAcceptsProofs() function
...
It was only used in one place
2023-01-23 15:10:23 +01:00
Mark Spanbroek
1316682a6f
[marketplace] remove slotMustAcceptProofs modifier
...
Replaced by checks on slot state
2023-01-23 15:10:23 +01:00
Mark Spanbroek
7d377a3739
[marketplace] remove requestMustAcceptProofs modifier
...
Is already covered by the slot state check later on
2023-01-23 15:10:23 +01:00
Mark Spanbroek
dd65133576
[marketplace] replace Slot.hostPaid with SlotState.Paid
2023-01-23 15:10:23 +01:00
Mark Spanbroek
5eeac8a782
[marketplace] remove unused import
2023-01-23 15:10:23 +01:00
Mark Spanbroek
c8dda37300
[marketplace] introduce SlotState
...
- replace proofEnd() by slotState()
- replace _slotAcceptsProofs() by slotState()
- remove _stopRequiringProofs()
2023-01-23 15:10:23 +01:00
Mark Spanbroek
de0595edb3
[marketplace] rename state(id) -> requestState(id)
2023-01-23 15:10:23 +01:00
Mark Spanbroek
10f88a62a7
[marketplace] Move RequestState enum to Requests.sol
2023-01-23 15:10:23 +01:00
Mark Spanbroek
bb0302afcb
[marketplace] inline function _notEqual
2023-01-23 15:10:23 +01:00
Mark Spanbroek
e496ac3550
[marketplace] remove _isCancelled and _isFinished
2023-01-23 15:10:23 +01:00
Mark Spanbroek
9aa4773392
[marketplace] remove unused _isSlotCancelled()
2023-01-23 15:10:23 +01:00
Mark Spanbroek
fffd0dcb86
[marketplace] remove dead code
2023-01-23 15:10:23 +01:00
Mark Spanbroek
de368708b2
[marketplace, proofs] simplify proofTimeout getter
2023-01-23 15:10:23 +01:00
Mark Spanbroek
6aa76257f8
[Marketplace] Move `slotId()` to `Requests` library
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-12 13:57:44 +01:00
Mark Spanbroek
07e9043b30
[Marketplace] Remove dead code
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-12 13:57:44 +01:00
Mark Spanbroek
2bfed21584
[Marketplace] Extract myRequests() and mySlots()
2023-01-12 13:57:44 +01:00
Mark Spanbroek
af08a72d7d
Fix: use slot start instead of request start
...
Proofs should be required from the moment a slot is filled,
not from the moment a request is submitted.
This reverts commit f224cb8eda
.
2023-01-12 13:49:08 +01:00
Mark Spanbroek
ad155be5a1
[Proofs] Extract period related types and function
2023-01-11 10:32:58 +01:00
Mark Spanbroek
c0690cd5d1
[Proofs] rename expectProofs -> startRequiringProofs
2023-01-11 10:27:08 +01:00
Mark Spanbroek
f224cb8eda
[Proofs] Remove double administration of request start
...
The timestamp when proofs start to be required was
stored in both the Marketplace and Proofs. It is now
only stored in the Marketplace.
2023-01-11 10:27:08 +01:00
Mark Spanbroek
527c21e103
[Proofs] Remove dead code
2023-01-11 10:27:08 +01:00
Mark Spanbroek
f8e9f3c848
[Proofs] Remove double administration of request end
...
The timestamp when proofs no longer are required was
stored in both the Marketplace and Proofs. It is now
only stored in the Marketplace.
2023-01-11 10:27:08 +01:00
Mark Spanbroek
19f93500ea
[Marketplace] Combine host getters
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-11 10:27:08 +01:00
Mark Spanbroek
ce335d0568
[Proofs] Improved naming
...
Co-authored-by: Eric Mastro <eric.mastro@gmail.com>
2023-01-10 12:15:22 +01:00
Mark Spanbroek
afad73d588
[Markeplace] Linting
2023-01-10 12:15:22 +01:00
Mark Spanbroek
afb89c9233
[Storage] Remove Storage
...
Rationale: it was already a very thin wrapper
around Marketplace, and now that its remaining
functionality has been moved to Proofs and
Marketplace, we no longer need it.
2023-01-10 12:15:22 +01:00
Mark Spanbroek
6ea2b77a8f
[Storage] Move markProofAsMissing() to Marketplace
2023-01-10 12:15:22 +01:00
Mark Spanbroek
a7397981bb
[Collateral] Inline slashAmount() function
2023-01-10 12:15:22 +01:00
Mark Spanbroek
39da450c2a
[Storage] Move submitProof() to Proofs
2023-01-10 12:15:22 +01:00