move sol to contracts dir

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
interlay · gregdhill · Aug 4, 2020 · Aug 4, 2020 · Aug 4, 2020 · Aug 4, 2020
commit 3bc05bbe3c8c6a553751b9f2c881b3dca53aff52
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.sol linguist-language=Solidity
diff --git a/buidler.config.ts b/buidler.config.ts
@@ -17,7 +17,7 @@ const config = {
     optimizer: { enabled: true, runs: 500 }
   },
 	paths: {
-		sources: './src',
+		sources: './contracts',
 		tests: './test',
 	},
 	typechain: {
@@ -42,7 +42,7 @@ const config = {
     enabled: (COINMARKETCAP_API_KEY ? true : false),
     coinmarketcap: COINMARKETCAP_API_KEY,
     currency: "GBP",
-    src: "./src"
+    src: "./contracts"
   },
 };
 

diff --git a/src/IRelay.sol → contracts/IRelay.sol b/src/IRelay.sol → contracts/IRelay.sol
diff --git a/src/Parser.sol → contracts/Parser.sol b/src/Parser.sol → contracts/Parser.sol
diff --git a/src/ParserDelegate.sol → contracts/ParserDelegate.sol b/src/ParserDelegate.sol → contracts/ParserDelegate.sol
diff --git a/src/Relay.sol → contracts/Relay.sol b/src/Relay.sol → contracts/Relay.sol
diff --git a/src/Script.sol → contracts/Script.sol b/src/Script.sol → contracts/Script.sol
diff --git a/src/ScriptDelegate.sol → contracts/ScriptDelegate.sol b/src/ScriptDelegate.sol → contracts/ScriptDelegate.sol
diff --git a/src/TestRelay.sol → contracts/TestRelay.sol b/src/TestRelay.sol → contracts/TestRelay.sol
diff --git a/package.json b/package.json
@@ -7,6 +7,10 @@
     "@openzeppelin/contracts": "3.1.0",
     "bitcoinjs-lib": "^5.1.7"
   },
+  "files": [
+    "contracts",
+    "dist"
+  ],
   "devDependencies": {
     "@nomiclabs/buidler": "^1.1.2",
     "@nomiclabs/buidler-ethers": "^1.1.2",

diff --git a/test/gas.test.ts b/test/gas.test.ts
@@ -25,7 +25,7 @@ describe("Gas", () => {
     relay = await deployContract(<Wallet>signers[0], RelayArtifact, [genesisHeader, genesisHeight]) as Relay;
     let deployCost = (await relay.deployTransaction.wait(1)).gasUsed?.toNumber();
     console.log(`Deploy: ${deployCost}`);
-    expect(deployCost).to.be.lt(1_900_000);
+    expect(deployCost).to.be.lt(2_000_000);
 
     let result = await relay.submitBlockHeader(header1);
     let updateCost = (await result.wait(1)).gasUsed?.toNumber();