ci: Enable Tests in CI (sphinx-labs#491)

hujw77 · Feb 11, 2023 · e4446ae · e4446ae
1 parent c94c331
commit e4446ae
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -14,7 +14,7 @@
     "build:ts": "tsc -p ./tsconfig.json",
     "build:contracts": "hardhat clean && hardhat compile",
     "clean": "rimraf dist/ ./tsconfig.tsbuildinfo",
-    "test:coverage": "echo 'no tests'",
+    "test:coverage": "forge test",
     "lint": "yarn lint:fix && yarn lint:check",
     "lint:check": "yarn lint:contracts:check && yarn lint:ts:check",
     "lint:fix": "yarn lint:contracts:fix && yarn lint:ts:fix",

diff --git a/packages/core/src/languages/solidity/compiler.ts b/packages/core/src/languages/solidity/compiler.ts
@@ -52,7 +52,6 @@ export const getSolcBuild = async (solcVersion: string): Promise<SolcBuild> => {
   )
 
   if (!isCompilerDownloaded) {
-    console.log(`Downloading compiler version ${solcVersion}`)
     await downloader.downloadCompiler(solcVersion)
   }
 
@@ -72,7 +71,6 @@ export const getSolcBuild = async (solcVersion: string): Promise<SolcBuild> => {
   )
 
   if (!isWasmCompilerDownloader) {
-    console.log(`Downloading compiler version ${solcVersion}`)
     await wasmDownloader.downloadCompiler(solcVersion)
   }
 

diff --git a/packages/executor/src/index.ts b/packages/executor/src/index.ts
@@ -2,8 +2,8 @@ import * as dotenv from 'dotenv'
 dotenv.config()
 import {
   BaseServiceV2,
-  StandardOptions,
   Logger,
+  StandardOptions,
   validators,
 } from '@eth-optimism/common-ts'
 import { ethers } from 'ethers'
@@ -109,6 +109,14 @@ export class ChugSplashExecutor extends BaseServiceV2<
     )
     this.state.lastBlockNumber = 0
 
+    // Passing the log level in when creating executor still does not work as expected.
+    // If you attempt to remove this, the foundry library will fail due to incorrect output to the console.
+    // This is because the foundry library parses stdout and expects a very specific format.
+    this.logger = new Logger({
+      name: 'Logger',
+      level: options.logLevel,
+    })
+
     // This represents a queue of "BundleApproved" events to execute.
     this.state.eventsQueue = []
 

diff --git a/packages/plugins/foundry-contracts/ChugSplash.sol b/packages/plugins/foundry-contracts/ChugSplash.sol
@@ -24,6 +24,7 @@ contract ChugSplash is Script, Test {
 
     string rpcUrl = vm.rpcUrl(network);
     string filePath = vm.envOr("DEV_FILE_PATH", string('./node_modules/@chugsplash/plugins/dist/foundry/index.js'));
+    bool isChugSplashTest = vm.envOr("IS_CHUGSPLASH_TEST", false);
 
     struct ChugSplashContract {
         string referenceName;
@@ -232,7 +233,14 @@ contract ChugSplash is Script, Test {
         cmds[14] = skipStorageCheck == true ? "true" : "false";
 
         bytes memory result = vm.ffi(cmds);
+        if (isChugSplashTest) {
+            emit log("Attempting to decode deploy command results:");
+            emit log_bytes(result);
+        }
         ChugSplashContract[] memory deployedContracts = abi.decode(result, (ChugSplashContract[]));
+        if (isChugSplashTest) {
+            emit log("Successfully decoded");
+        }
 
         if (silent == false) {
             emit log("Success!");

diff --git a/packages/plugins/foundry.toml b/packages/plugins/foundry.toml
@@ -11,7 +11,7 @@ libs = ['node_modules', 'lib']
 test = 'test/foundry'
 cache_path  = 'forge-cache'
 verbosity = 2
-allow_paths = ["node_modules/@chugsplash/contracts"]
+allow_paths = ["../contracts"]
 
 
 [rpc_endpoints]

diff --git a/packages/plugins/package.json b/packages/plugins/package.json
@@ -16,7 +16,7 @@
     "test": "yarn test:forge && yarn test:hardhat",
     "test:forge": "anvil & ANVIL_PID=$! && forge test && kill $ANVIL_PID",
     "test:hardhat": "npx hardhat test --config-path ./chugsplash/Storage.config.ts",
-    "test:coverage": "echo 'no tests'",
+    "test:coverage": "export DEV_FILE_PATH='./dist/foundry/index.js' && export DISABLE_ANALYTICS=true && IS_CHUGSPLASH_TEST=true && yarn test",
     "lint": "yarn lint:fix && yarn lint:check",
     "lint:fix": "yarn lint:ts:fix",
     "lint:check": "yarn lint:ts:check",

diff --git a/packages/plugins/remappings.txt b/packages/plugins/remappings.txt
@@ -1,6 +1,6 @@
-@chugsplash/=node_modules/@chugsplash
-@openzeppelin/contracts-upgradeable/=node_modules/@chugsplash/contracts/node_modules/@openzeppelin/contracts-upgradeable/
-@openzeppelin/contracts/=node_modules/@chugsplash/contracts/node_modules/@openzeppelin/contracts/
+@chugsplash/=../
+@openzeppelin/contracts-upgradeable/=../contracts/node_modules/@openzeppelin/contracts-upgradeable/
+@openzeppelin/contracts/=../contracts/node_modules/@openzeppelin/contracts/
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 node_modules/=node_modules/
diff --git a/packages/plugins/src/executor.ts b/packages/plugins/src/executor.ts
@@ -15,6 +15,9 @@ export const initializeExecutor = async (
     {
       privateKey:
         '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
+      // Passing the log level in when creating executor still does not work as expected.
+      // If you attempt to remove this option, the foundry library will fail due to incorrect output to the console.
+      // This is because the foundry library parses stdout and expects a very specific format.
       logLevel: 'error',
     },
     false,