refactor cli folder

.eslintignore

@@ -10,6 +10,7 @@ polygonpos/
 wallet/src/components/Assets/
 test/adversary/lazy-optimist/*
 test/adversary/adversary-cli/*
+test/adversary/adversary-common-files/*
 test/adversary/adversary-code/*
 test/adversary/bad-client/*
 /**/*.d.ts

.gitignore

@@ -17,6 +17,7 @@ __pycache__
 test/adversary/lazy-optimist
 test/adversary/bad-client
 test/adversary/adversary-cli
+test/adversary/adversary-common-files
 wallet/tests/e2e/videos
 wallet/tests/e2e/screenshots
 typechain-types/

apps/challenger/src/app.mjs

@@ -5,7 +5,7 @@
 import express from 'express';
 import config from 'config';
 import { setupHttpDefaults } from 'common-files/utils/httputils.mjs';
-import Nf3 from '../cli/lib/nf3.mjs';
+import Nf3 from 'common-files/classes/nf3.mjs';
 import startChallenger from './challenger.mjs';
 
 const CHALLENGER_PORT = process.env.CHALLENGER_PORT || 8192;

apps/proposer/src/app.mjs

@@ -5,9 +5,9 @@
 import express from 'express';
 import config from 'config';
 import { setupHttpDefaults } from 'common-files/utils/httputils.mjs';
+import Nf3 from 'common-files/classes/nf3.mjs';
 import { proposer, contracts } from './routes/index.mjs';
 import startProposer from './proposer.mjs';
-import Nf3 from '../cli/lib/nf3.mjs';
 
 const PROPOSER_PORT = process.env.PROPOSER_PORT || 8092;
 

apps/synchronizer/src/app.mjs

@@ -4,8 +4,8 @@
 import express from 'express';
 import config from 'config';
 import { setupHttpDefaults } from 'common-files/utils/httputils.mjs';
+import Nf3 from 'common-files/classes/nf3.mjs';
 import { contracts } from './routes/index.mjs';
-import Nf3 from '../../../cli/lib/nf3.mjs';
 import startSynchronizer from './synchronizer.mjs';
 
 const { SYNCHRONIZER_PORT } = config;

bin/liquidity-provider

@@ -6,4 +6,4 @@
 #  --environment : test environment (such us localhost, docker, testnet). If no argument given
 #     liquitidty-provider is launched in localhost environment
 
-/usr/bin/env node cli/src/liquidity-provider.mjs "${@:1}"
+/usr/bin/env node js-scripts/liquidity-provider.mjs "${@:1}"

bin/setup-nightfall

@@ -5,7 +5,6 @@ set -e
 if [ "$SKIP_NPM_CI" == "" ]; then
   # Install node dependencies
   npm ci
-  cd cli && npm ci && cd ..
   cd common-files && npm ci && cd ..
 fi