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

Add getHost() to retrieve host that fulfills request

This commit is contained in:
Mark Spanbroek 2022-07-04 11:16:55 +02:00 committed by markspanbroek
parent 1227ce8658
commit 97ef1bcd9f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/Storage.sol
View File

@ -38,6 +38,10 @@ contract Storage is Collateral, Marketplace {
return _request(id); return _request(id);
} }
function getHost(bytes32 id) public view returns (address) {
return _host(id);
}
function finishContract(bytes32 id) public { function finishContract(bytes32 id) public {
require(_host(id) != address(0), "Contract not started"); require(_host(id) != address(0), "Contract not started");
require(!contractFinished[id], "Contract already finished"); require(!contractFinished[id], "Contract already finished");

7
test/Storage.test.js
View File

@ -1,6 +1,7 @@
const { expect } = require("chai") const { expect } = require("chai")
const { ethers, deployments } = require("hardhat") const { ethers, deployments } = require("hardhat")
const { hexlify, randomBytes } = ethers.utils const { hexlify, randomBytes } = ethers.utils
const { AddressZero } = ethers.constants
const { exampleRequest } = require("./examples") const { exampleRequest } = require("./examples")
const { advanceTime, advanceTimeTo, currentTime } = require("./evm") const { advanceTime, advanceTimeTo, currentTime } = require("./evm")
const { requestId } = require("./ids") const { requestId } = require("./ids")
@ -55,6 +56,12 @@ describe("Storage", function () {
expect(retrieved.nonce).to.equal(request.nonce) expect(retrieved.nonce).to.equal(request.nonce)
}) })
it("can retrieve host that fulfilled request", async function () {
expect(await storage.getHost(requestId(request))).to.equal(AddressZero)
await storage.fulfillRequest(requestId(request), proof)
expect(await storage.getHost(requestId(request))).to.equal(host.address)
})
describe("finishing the contract", function () { describe("finishing the contract", function () {
async function waitUntilEnd() { async function waitUntilEnd() {
const end = (await storage.proofEnd(id)).toNumber() const end = (await storage.proofEnd(id)).toNumber()