Change parameter order

Move parameters belonging to the bid together.

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
   )

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
     );

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);
   }

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")

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)
       )