logos-storage/logos-storage-contracts-eth
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-contracts-eth.git synced 2026-01-22 15:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove cancelled request filtering

Browse Source
This commit is contained in:
Eric Mastro 2022-11-24 22:11:28 +11:00
parent af7f0dd8cf
commit 0dd02ef31a
No known key found for this signature in database
GPG Key ID: 141E3048D95A4E63
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
contracts/Marketplace.sol
View File

@ -46,23 +46,9 @@ contract Marketplace is Collateral, Proofs {
}
function myRequests() public view returns (RequestId[] memory) {
uint256 counter = 0;
Mappings.ValueId[] storage valueIds =
activeClientRequests.getValueIds(Mappings.toKeyId(msg.sender));
bytes32[] memory result = new bytes32[](valueIds.length);
for (uint8 i = 0; i < valueIds.length; i++) {
// There may exist slots that are still "active", but are part of a request
// that is expired but has not been set to the cancelled state yet. In that
// case, return an empty array.
// TODO: remove cancelled lookups https://discord.com/channels/@me/958221374076366898/1044947242013954140
Mappings.ValueId valueId = valueIds[i];
if (_isCancelled(_toRequestId(valueId))) {
continue;
}
result[counter] = Mappings.ValueId.unwrap(valueId);
counter++;
}
return _toRequestIds(Utils._resize(result, counter));
return _toRequestIds(valueIds);
}
function mySlots()
@ -82,12 +68,7 @@ contract Marketplace is Collateral, Proofs {
// There may exist slots that are still "active", but are part of a request
// that is expired but has not been set to the cancelled state yet. In that
// case, return an empty array.
// TODO: remove cancelled lookups https://discord.com/channels/@me/958221374076366898/1044947242013954140
Mappings.ValueId requestId = valueIds[i];
if (_isCancelled(_toRequestId(requestId))) {
continue;
}
Mappings.KeyId keyId = Mappings.toKeyId(requestId);
Mappings.KeyId keyId = Mappings.toKeyId(valueIds[i]);
if (activeRequestSlots.keyExists(keyId)) {
Mappings.ValueId[] storage slotIds =
activeRequestSlots.getValueIds(keyId);
@ -440,7 +421,7 @@ contract Marketplace is Collateral, Proofs {
return RequestId.wrap(Mappings.ValueId.unwrap(valueId));
}
function _toRequestIds(bytes32[] memory array)
function _toRequestIds(Mappings.ValueId[] memory array)
private
pure
returns (RequestId[] memory result)