diff --git a/contracts/Contracts.sol b/contracts/Contracts.sol index 90dc995..f2a7c23 100644 --- a/contracts/Contracts.sol +++ b/contracts/Contracts.sol @@ -36,12 +36,12 @@ contract Contracts { uint duration, uint size, bytes32 contentHash, - uint price, uint proofPeriod, uint proofTimeout, bytes32 nonce, - uint bidExpiry, + uint price, address host, + uint bidExpiry, bytes memory requestSignature, bytes memory bidSignature ) diff --git a/contracts/StorageContracts.sol b/contracts/StorageContracts.sol index d9da000..835c7b8 100644 --- a/contracts/StorageContracts.sol +++ b/contracts/StorageContracts.sol @@ -10,12 +10,12 @@ contract StorageContracts is Contracts, Proofs { uint _duration, uint _size, bytes32 _contentHash, - uint _price, uint _proofPeriod, uint _proofTimeout, bytes32 _nonce, - uint _bidExpiry, + uint _price, address _host, + uint _bidExpiry, bytes memory requestSignature, bytes memory bidSignature ) @@ -25,12 +25,12 @@ contract StorageContracts is Contracts, Proofs { _duration, _size, _contentHash, - _price, _proofPeriod, _proofTimeout, _nonce, - _bidExpiry, + _price, _host, + _bidExpiry, requestSignature, bidSignature ); diff --git a/contracts/TestContracts.sol b/contracts/TestContracts.sol index 8f3b1c1..9916ceb 100644 --- a/contracts/TestContracts.sol +++ b/contracts/TestContracts.sol @@ -9,12 +9,12 @@ contract TestContracts is Contracts { uint _duration, uint _size, bytes32 _contentHash, - uint _price, uint _proofPeriod, uint _proofTimeout, bytes32 _nonce, - uint _bidExpiry, + uint _price, address _host, + uint _bidExpiry, bytes memory requestSignature, bytes memory bidSignature ) @@ -24,12 +24,12 @@ contract TestContracts is Contracts { _duration, _size, _contentHash, - _price, _proofPeriod, _proofTimeout, _nonce, - _bidExpiry, + _price, _host, + _bidExpiry, requestSignature, bidSignature); } diff --git a/test/Contracts.test.js b/test/Contracts.test.js index dd4c2bb..9e4e067 100644 --- a/test/Contracts.test.js +++ b/test/Contracts.test.js @@ -40,12 +40,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - bidExpiry, + price, await host.getAddress(), + bidExpiry, await sign(client, requestHash), await sign(host, bidHash) ) @@ -61,12 +61,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - bidExpiry, + price, await host.getAddress(), + bidExpiry, await sign(client, requestHash), await sign(host, bidHash) ) @@ -74,12 +74,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - bidExpiry, + price, await host.getAddress(), + bidExpiry, await sign(client, requestHash), await sign(host, bidHash) )).to.be.revertedWith("A contract with this id already exists") @@ -99,12 +99,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - bidExpiry, + price, await host.getAddress(), + bidExpiry, invalidSignature, await sign(host, bidHash) )).to.be.revertedWith("Invalid signature") @@ -117,12 +117,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - bidExpiry, + price, await host.getAddress(), + bidExpiry, await sign(client, requestHash), invalidSignature )).to.be.revertedWith("Invalid signature") @@ -135,12 +135,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - expired, + price, await host.getAddress(), + expired, await sign(client, requestHash), await sign(host, bidHash), )).to.be.revertedWith("Bid expired") diff --git a/test/StorageContracts.test.js b/test/StorageContracts.test.js index a2bd7d6..5585fb5 100644 --- a/test/StorageContracts.test.js +++ b/test/StorageContracts.test.js @@ -42,12 +42,12 @@ describe("Storage Contracts", function () { duration, size, contentHash, - price, proofPeriod, proofTimeout, nonce, - bidExpiry, + price, await host.getAddress(), + bidExpiry, await sign(client, requestHash), await sign(host, bidHash) )