status-im
/
dagger-contracts
mirror of https://github.com/status-im/dagger-contracts.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[marketplace] inline function _notEqual

This commit is contained in:
Mark Spanbroek 2023-01-16 14:21:20 +01:00 committed by markspanbroek
parent e496ac3550
commit bb0302afcb
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/Marketplace.sol
View File

@ -235,7 +235,7 @@ contract Marketplace is Collateral, Proofs, StateRetrieval {
SlotId slotId SlotId slotId
) internal view returns (RequestId) { ) internal view returns (RequestId) {
Slot memory slot = _slot(slotId); Slot memory slot = _slot(slotId);
require(_notEqual(slot.requestId, 0), "Missing request id"); require(RequestId.unwrap(slot.requestId) != 0, "Missing request id");
return slot.requestId; return slot.requestId;
} }
@ -365,10 +365,6 @@ contract Marketplace is Collateral, Proofs, StateRetrieval {
return s == RequestState.New || s == RequestState.Started; return s == RequestState.New || s == RequestState.Started;
} }
function _notEqual(RequestId a, uint256 b) internal pure returns (bool) {
return RequestId.unwrap(a) != bytes32(b);
}
enum RequestState { enum RequestState {
New, // [default] waiting to fill slots New, // [default] waiting to fill slots
Started, // all slots filled, accepting regular proofs Started, // all slots filled, accepting regular proofs