Add prettier and config for ts-tests (paritytech#725)

* Add prettier for ts-tests Signed-off-by: koushiro <[email protected]> * Use tabWidth = 4 Signed-off-by: koushiro <[email protected]> * Add config for tests Signed-off-by: koushiro <[email protected]> * Use double quote by default Signed-off-by: koushiro <[email protected]> * Add describeWithFrontierWs to reduce git diff Signed-off-by: koushiro <[email protected]> * Rename .prettierrc.json => .prettierrc.js Signed-off-by: koushiro <[email protected]>
boolnetwork · Jun 15, 2022 · 28c4bce · 28c4bce
1 parent f508edb
commit 28c4bce
Show file tree

Hide file tree

Showing 30 changed files with 591 additions and 485 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -48,6 +48,8 @@ jobs:
         node-version: 10
     - name: Install functional tests typescript
       run: cd ts-tests && npm install
+    - name: Check functional tests format
+      run: cd ts-tests && npm run fmt-check
     - name: Run functional tests
       run: cd ts-tests && npm run build && npm run test
 

diff --git a/ts-tests/.prettierrc.js b/ts-tests/.prettierrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+  printWidth: 120,
+  tabWidth: 4
+}
diff --git a/ts-tests/contracts/Storage.sol b/ts-tests/contracts/Storage.sol
@@ -11,4 +11,4 @@ contract Storage {
           sstore(key, value)
       }
   }
-}
+}
diff --git a/ts-tests/package-lock.json b/ts-tests/package-lock.json
diff --git a/ts-tests/package.json b/ts-tests/package.json
@@ -4,6 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
+    "fmt-check": "prettier ./tests --check",
+    "fmt": "prettier ./tests --write",
     "build": "truffle compile",
     "test": "mocha -r ts-node/register 'tests/**/*.ts'"
   },
@@ -24,6 +26,7 @@
     "web3": "^1.3.4"
   },
   "devDependencies": {
-    "@types/chai-as-promised": "^7.1.5"
+    "@types/chai-as-promised": "^7.1.5",
+    "prettier": "^2.6.2"
   }
 }
diff --git a/ts-tests/tests/config.ts b/ts-tests/tests/config.ts
@@ -0,0 +1,8 @@
+export const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b";
+export const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342";
+
+export const FIRST_CONTRACT_ADDRESS = "0xc2bf5f29a4384b1ab0c063e1c666f02121b6084a";
+
+export const CHAIN_ID = 42;
+export const BLOCK_HASH_COUNT = 256;
+export const BLOCK_GAS_LIMIT = 75000000;
diff --git a/ts-tests/tests/test-balance.ts b/ts-tests/tests/test-balance.ts
@@ -1,12 +1,11 @@
 import { expect } from "chai";
 import { step } from "mocha-steps";
 
+import { GENESIS_ACCOUNT, GENESIS_ACCOUNT_PRIVATE_KEY } from "./config";
 import { createAndFinalizeBlock, describeWithFrontier, customRequest } from "./util";
 
 describeWithFrontier("Frontier RPC (Balance)", (context) => {
-	const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b";
 	const GENESIS_ACCOUNT_BALANCE = "340282366920938463463374607431768210955";
-	const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342";
 	const TEST_ACCOUNT = "0x1111111111111111111111111111111111111111";
 
 	step("genesis balance is setup correctly", async function () {
@@ -16,21 +15,24 @@ describeWithFrontier("Frontier RPC (Balance)", (context) => {
 	step("balance to be updated after transfer", async function () {
 		this.timeout(15000);
 
-		const tx = await context.web3.eth.accounts.signTransaction({
-			from: GENESIS_ACCOUNT,
-			to: TEST_ACCOUNT,
-			value: "0x200", // Must be higher than ExistentialDeposit (500)
-			gasPrice: "0x3B9ACA00",
-			gas: "0x100000",
-		}, GENESIS_ACCOUNT_PRIVATE_KEY);
+		const tx = await context.web3.eth.accounts.signTransaction(
+			{
+				from: GENESIS_ACCOUNT,
+				to: TEST_ACCOUNT,
+				value: "0x200", // Must be higher than ExistentialDeposit (500)
+				gasPrice: "0x3B9ACA00",
+				gas: "0x100000",
+			},
+			GENESIS_ACCOUNT_PRIVATE_KEY
+		);
 		await customRequest(context.web3, "eth_sendRawTransaction", [tx.rawTransaction]);
 		const expectedGenesisBalance = "340282366920938463463374586431768210443";
 		const expectedTestBalance = "12";
 		expect(await context.web3.eth.getBalance(GENESIS_ACCOUNT, "pending")).to.equal(expectedGenesisBalance);
 		expect(await context.web3.eth.getBalance(TEST_ACCOUNT, "pending")).to.equal(expectedTestBalance);
 		await createAndFinalizeBlock(context.web3);
-		// 340282366920938463463374607431768210955 - (21000 * 1000000000) + 512; 
+		// 340282366920938463463374607431768210955 - (21000 * 1000000000) + 512;
 		expect(await context.web3.eth.getBalance(GENESIS_ACCOUNT)).to.equal(expectedGenesisBalance);
 		expect(await context.web3.eth.getBalance(TEST_ACCOUNT)).to.equal(expectedTestBalance);
 	});
-});
+});
diff --git a/ts-tests/tests/test-block.ts b/ts-tests/tests/test-block.ts
@@ -1,6 +1,7 @@
 import { expect } from "chai";
 import { step } from "mocha-steps";
 
+import { BLOCK_GAS_LIMIT } from "./config";
 import { createAndFinalizeBlock, describeWithFrontier } from "./util";
 
 describeWithFrontier("Frontier RPC (Block)", (context) => {
@@ -21,7 +22,7 @@ describeWithFrontier("Frontier RPC (Block)", (context) => {
 			author: "0x0000000000000000000000000000000000000000",
 			difficulty: "0",
 			extraData: "0x",
-			gasLimit: 75000000,
+			gasLimit: BLOCK_GAS_LIMIT,
 			gasUsed: 0,
 			logsBloom:
 				"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -73,7 +74,7 @@ describeWithFrontier("Frontier RPC (Block)", (context) => {
 			author: "0x0000000000000000000000000000000000000000",
 			difficulty: "0",
 			extraData: "0x",
-			gasLimit: 75000000,
+			gasLimit: BLOCK_GAS_LIMIT,
 			gasUsed: 0,
 			logsBloom:
 				"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -99,7 +100,7 @@ describeWithFrontier("Frontier RPC (Block)", (context) => {
 			author: "0x0000000000000000000000000000000000000000",
 			difficulty: "0",
 			extraData: "0x",
-			gasLimit: 75000000,
+			gasLimit: BLOCK_GAS_LIMIT,
 			gasUsed: 0,
 			//hash: "0x14fe6f7c93597f79b901f8b5d7a84277a90915b8d355959b587e18de34f1dc17",
 			logsBloom:
@@ -125,13 +126,13 @@ describeWithFrontier("Frontier RPC (Block)", (context) => {
 		expect(block.timestamp).to.be.a("number");
 	});
 
-	step("get block by hash", async function() {
+	step("get block by hash", async function () {
 		const latest_block = await context.web3.eth.getBlock("latest");
 		const block = await context.web3.eth.getBlock(latest_block.hash);
 		expect(block.hash).to.be.eq(latest_block.hash);
 	});
 
-	step("get block by number", async function() {
+	step("get block by number", async function () {
 		const block = await context.web3.eth.getBlock(1);
 		expect(block).not.null;
 	});

diff --git a/ts-tests/tests/test-bloom.ts b/ts-tests/tests/test-bloom.ts
@@ -1,13 +1,10 @@
 import { expect } from "chai";
 import { step } from "mocha-steps";
 
+import { GENESIS_ACCOUNT, GENESIS_ACCOUNT_PRIVATE_KEY } from "./config";
 import { createAndFinalizeBlock, customRequest, describeWithFrontier } from "./util";
 
 describeWithFrontier("Frontier RPC (Bloom)", (context) => {
-
-	const GENESIS_ACCOUNT = "0x6be02d1d3665660d22ff9624b7be0551ee1ac91b";
-	const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342";
-
 	const TEST_CONTRACT_BYTECODE =
 		"0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f45524332303a206d696e7420746f20746865207a65726f20616464726573730081525060200191505060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b600080828401905083811015610287576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a08231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f35b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061049a565b604051808215151515815260200191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610662565b604051808215151515815260200191505060405180910390f35b6103836004803603604081101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a85604051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000610440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b600190509392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b6001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a2610707565b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610795576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610d286022913960400191505060405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040518082815260200191505060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526025815260200180610d986025913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610a12576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526023815260200180610d056023913960400191505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a602691396000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c69576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c2e578082015181840152602081019050610c13565b50505050905090810190601f168015610c5b5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b600080828401905083811015610cfa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ffabf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032";
 
@@ -33,13 +30,13 @@ describeWithFrontier("Frontier RPC (Bloom)", (context) => {
 		// check transaction bloom
 		tx = await context.web3.eth.getTransactionReceipt(tx.transactionHash);
 		expect(context.web3.utils.isInBloom(tx.logsBloom, tx.logs[0].address)).to.be.true;
-		for(var topic of tx.logs[0].topics) {
+		for (var topic of tx.logs[0].topics) {
 			expect(context.web3.utils.isInBloom(tx.logsBloom, topic)).to.be.true;
 		}
 		// check block bloom
 		const block = await context.web3.eth.getBlock("latest");
 		expect(context.web3.utils.isInBloom(block.logsBloom, tx.logs[0].address)).to.be.true;
-		for(var topic of tx.logs[0].topics) {
+		for (var topic of tx.logs[0].topics) {
 			expect(context.web3.utils.isInBloom(block.logsBloom, topic)).to.be.true;
 		}
 	});
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ contract Storage { @@
               sstore(key, value)
           }
       }
-    }
+    }