remove evmchai from bodhi exports (#1011)

* remove evmchai from build

* move evmchai to waffle examples

* polish

* update

examples/waffle/arbitrager/src/deploy.ts

@@ -1,13 +1,15 @@
 import { expect, use } from 'chai';
 import { Contract, ContractFactory, BigNumber } from 'ethers';
-import { evmChai, getTestUtils } from '@acala-network/bodhi';
+import { getTestUtils } from '@acala-network/bodhi';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 
 import UniswapFactory from '../artifacts/UniswapV2Factory.json';
 import UniswapRouter from '../artifacts/UniswapV2Router02.json';
 import Arbitrager from '../build/Arbitrager.json';
 import IERC20 from '../artifacts/IERC20.json';
 
+import { evmChai } from '../../evm-chai';
+
 use(evmChai);
 
 const main = async () => {

examples/waffle/dex/test/Dex.test.ts

@@ -1,9 +1,11 @@
-import { BodhiSigner as Signer, evmChai, getTestUtils } from '@acala-network/bodhi';
+import { BodhiSigner as Signer, getTestUtils } from '@acala-network/bodhi';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { Contract, ethers } from 'ethers';
+
 import Dex from '../build/Dex.json';
+import { evmChai } from '../../evm-chai';
 
 use(solidity);
 use(evmChai);

examples/waffle/e2e/test/dex.test.ts

@@ -1,11 +1,13 @@
 import { expect, use } from 'chai';
 import { BigNumber } from 'ethers';
 import { deployContract } from 'ethereum-waffle';
-import { BodhiSigner, evmChai, getTestUtils } from '@acala-network/bodhi';
+import { BodhiSigner, getTestUtils } from '@acala-network/bodhi';
 import { EvmRpcProvider, hexlifyRpcResult, BodhiProvider } from '@acala-network/eth-providers';
 import TestToken from '../build/TestToken.json';
 import { AddressOrPair, SubmittableExtrinsic } from '@polkadot/api/types';
 
+import { evmChai } from '../../evm-chai';
+
 use(evmChai);
 
 const endpoint = process.env.ENDPOINT_URL || 'ws://127.0.0.1:9944';

examples/waffle/erc20/test/ACAToken.test.ts

@@ -1,9 +1,11 @@
 import { expect, use } from 'chai';
 import { ethers, Contract } from 'ethers';
 import { solidity } from 'ethereum-waffle';
-import { getTestUtils, Signer, evmChai } from '@acala-network/bodhi';
+import { getTestUtils, Signer } from '@acala-network/bodhi';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/erc20/test/BasicToken.test.ts

@@ -2,9 +2,11 @@ import { expect, use } from 'chai';
 import { Contract } from 'ethers';
 import { deployContract, solidity } from 'ethereum-waffle';
 import BasicToken from '../build/BasicToken.json';
-import { getTestUtils, BodhiSigner, evmChai, BodhiProvider } from '@acala-network/bodhi';
+import { getTestUtils, BodhiSigner, BodhiProvider } from '@acala-network/bodhi';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/erc20/test/LP-ACA-AUSD-Token.test.ts

@@ -1,9 +1,11 @@
 import { expect, use } from 'chai';
 import { ethers, Contract } from 'ethers';
 import { solidity } from 'ethereum-waffle';
-import { getTestUtils, Signer, evmChai } from '@acala-network/bodhi';
+import { getTestUtils, Signer } from '@acala-network/bodhi';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/evm-accounts/test/EVMAccounts.test.ts

@@ -1,4 +1,4 @@
-import { Signer, evmChai, getTestUtils } from '@acala-network/bodhi';
+import { Signer, getTestUtils } from '@acala-network/bodhi';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
@@ -9,6 +9,8 @@ import { Keyring } from '@polkadot/keyring';
 import { randomAsHex, blake2AsU8a } from '@polkadot/util-crypto';
 import { u8aConcat, stringToU8a, u8aToHex } from '@polkadot/util';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/evm-chai/README.md

@@ -0,0 +1 @@
+# Chai plugin for EVM+ tests

examples/waffle/evm-chai/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "evm-waffle-example-evm-chai",
+  "version": "1.0.0",
+  "main": "dist/index.js",
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {
+    "chai": "~4.3.4"
+  },
+  "devDependencies": {
+    "@types/chai": "~4.2.22",
+    "typescript": "~4.6.3"
+  }
+}

examples/waffle/evm-chai/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "exclude": ["node_modules", "dist"],
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+  }
+}

examples/waffle/evm/test/EVM.test.ts

@@ -1,11 +1,13 @@
-import { BodhiSigner, evmChai, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
+import { BodhiSigner, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { Contract, ethers } from 'ethers';
 import EVM from '../build/EVM.json';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/hello-world/test/HelloWorld.test.ts

@@ -1,9 +1,11 @@
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { Contract } from 'ethers';
-import { evmChai, Signer, getTestUtils } from '@acala-network/bodhi';
+import { Signer, getTestUtils } from '@acala-network/bodhi';
 import HelloWorld from '../build/HelloWorld.json';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/homa/test/homa.test.ts

@@ -1,11 +1,13 @@
-import { BodhiSigner, evmChai, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
+import { BodhiSigner, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { BigNumber, Contract, ethers } from 'ethers';
 import Homa from '../build/Homa.json';
 import ADDRESS from '@acala-network/contracts/utils/AcalaAddress';
 import { AddressOrPair, SubmittableExtrinsic } from '@polkadot/api/types';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/honzon/test/honzon.test.ts

@@ -1,11 +1,13 @@
-import { BodhiSigner, evmChai, BodhiProvider, getTestUtils } from '@acala-network/bodhi';
+import { BodhiSigner, BodhiProvider, getTestUtils } from '@acala-network/bodhi';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { BigNumber, Contract, ethers } from 'ethers';
 import Honzon from '../build/Honzon.json';
 import ADDRESS from '@acala-network/contracts/utils/AcalaAddress';
 import { AddressOrPair, SubmittableExtrinsic } from '@polkadot/api/types';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/incentives/test/incentives.test.ts

@@ -1,11 +1,13 @@
-import { BodhiSigner, evmChai, BodhiProvider, getTestUtils } from '@acala-network/bodhi';
+import { BodhiSigner, BodhiProvider, getTestUtils } from '@acala-network/bodhi';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { BigNumber, Contract, ethers } from 'ethers';
 import Incentives from '../build/Incentives.json';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 import { AddressOrPair, SubmittableExtrinsic } from '@polkadot/api/types';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/oracle/test/Prices.test.ts

@@ -1,4 +1,4 @@
-import { evmChai, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
+import { getTestUtils, BodhiProvider } from '@acala-network/bodhi';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
@@ -7,6 +7,8 @@ import Prices from '../build/Prices.json';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 import { parseEther } from 'ethers/lib/utils';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/scheduler/test/Scheduler.test.ts

@@ -1,13 +1,15 @@
 import { expect, use } from 'chai';
 import { ethers, BigNumber, Contract } from 'ethers';
 import { deployContract } from 'ethereum-waffle';
-import { getTestUtils, BodhiSigner, evmChai, BodhiProvider } from '@acala-network/bodhi';
+import { getTestUtils, BodhiSigner, BodhiProvider } from '@acala-network/bodhi';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import RecurringPayment from '../build/RecurringPayment.json';
 import Subscription from '../build/Subscription.json';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 import { sleep } from '@acala-network/eth-providers';
 
+import { evmChai } from '../../evm-chai';
+
 use(evmChai);
 
 const testPairs = createTestPairs();

examples/waffle/stable-asset/test/stableAsset.test.ts

@@ -1,11 +1,13 @@
-import { BodhiSigner, evmChai, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
+import { BodhiSigner, getTestUtils, BodhiProvider } from '@acala-network/bodhi';
 import { expect, use } from 'chai';
 import { deployContract, solidity } from 'ethereum-waffle';
 import { BigNumber, Contract, ethers } from 'ethers';
 import StableAsset from '../build/StableAsset.json';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 import { AddressOrPair, SubmittableExtrinsic } from '@polkadot/api/types';
 
+import { evmChai } from '../../evm-chai';
+
 use(solidity);
 use(evmChai);
 

examples/waffle/uniswap/src/deploy-and-trade.ts

@@ -1,15 +1,17 @@
 import { Contract, BigNumber, ContractFactory } from 'ethers';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 import { use } from 'chai';
-import { evmChai, getTestUtils } from '@acala-network/bodhi';
+import { getTestUtils } from '@acala-network/bodhi';
 
 import UniswapFactory from '../artifacts/UniswapV2Factory.json';
 import UniswapRouter from '../artifacts/UniswapV2Router02.json';
 import IERC20 from '../artifacts/IERC20.json';
 
-const dollar = BigNumber.from('1000000000000');
+import { evmChai } from '../../evm-chai';
+
 use(evmChai);
 
+const dollar = BigNumber.from('1000000000000');
 const endpoint = process.env.ENDPOINT_URL ?? 'ws://localhost:9944';
 
 const deploy = async () => {

packages/bodhi/src/index.ts

@@ -1,5 +1,4 @@
 export { BodhiProvider } from '@acala-network/eth-providers';
 export * from './BodhiSigner';
 export * from './SubstrateSigner';
-export * from './evmChai';
 export * from './utils';