From 907f5fe841e5a346512ceabbe1ac53586041e107 Mon Sep 17 00:00:00 2001 From: Rainer Koirikivi Date: Fri, 21 May 2021 15:55:51 +0300 Subject: [PATCH 1/2] Minimal backwards-compatible typescript boilerplate --- integration-tests/package.json | 10 +++++++--- package.json | 15 +++++++++------ tsconfig.json | 9 +++++++++ 3 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 tsconfig.json diff --git a/integration-tests/package.json b/integration-tests/package.json index 9593642..67aa79f 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -9,11 +9,11 @@ "npm": "^3.0.0" }, "scripts": { - "test": "node -r esm node_modules/.bin/hardhat test", + "test": "node -r ts-node/register node_modules/.bin/hardhat test", "publish": "echo no && false", "init-contracts": "git submodule update --init && bash ./initialize_contracts.sh", - "show-smart-contract-state": "node -r esm tools/showSmartContractState.js", - "show-arbitrage-state": "node -r esm tools/showSmartContractState.js" + "show-smart-contract-state": "node -r ts-node/register tools/showSmartContractState.js", + "show-arbitrage-state": "node -r ts-node/register tools/showSmartContractState.js" }, "devDependencies": { "@nomiclabs/hardhat-truffle5": "^2.0.0", @@ -39,5 +39,9 @@ "sinon": "^10.0.0", "truffle": "5.1.36", "web3": "^1.2.11" + }, + "dependencies": { + "ts-node": "^9.1.1", + "typescript": "^4.2.4" } } diff --git a/package.json b/package.json index 809590b..ac3eadd 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "version": "1.0.0", "description": "liquidation handler and rollover of open positions for sovryn smart contracts", "scripts": { - "test-lx": "mocha -r esm ./tests/test_liquidations.js --timeout 2500000", - "test-network": "node -r esm ./tests/network.js", - "start:test": "nodemon -r esm start.js testnet", - "start:main": "nodemon -r esm start.js mainnet", + "test-lx": "mocha -r ts-node/register ./tests/test_liquidations.js --timeout 2500000", + "test-network": "node -r ts-node/register ./tests/network.js", + "start:test": "nodemon -r ts-node/register start.js testnet", + "start:main": "nodemon -r ts-node/register start.js mainnet", "dev": "npx webpack-dev-server --open --config ./public/webpack.config.ts", "build-client": "npx webpack --config ./public/webpack.config.ts", - "approveWalletsMain": "node -r esm ./util/approval.js mainnet", - "approveWalletsTest": "node -r esm ./util/approval.js testnet" + "approveWalletsMain": "node -r ts-node/register ./util/approval.js mainnet", + "approveWalletsTest": "node -r ts-node/register ./util/approval.js testnet" }, "author": "", "license": "ISC", @@ -27,10 +27,13 @@ "sqlite3": "^5.0.0", "style-loader": "^2.0.0", "telegraf": "^3.38.0", + "ts-node": "^9.1.1", + "typescript": "^4.2.4", "web3": "1.3.3", "webpack-dev-server": "^3.11.2" }, "devDependencies": { + "mocha": "^8.4.0", "webpack": "^4.44.1", "webpack-cli": "^3.3.12" } diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..c561885 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "esModuleInterop": true, + "allowJs": true, + }, + "include": ["./**/*"], + "exclude": ["./integration-tests/**/*"] +} + From 864df5b61d2ecd5b329375292325931092400919 Mon Sep 17 00:00:00 2001 From: Rainer Koirikivi Date: Wed, 9 Jun 2021 17:19:07 +0300 Subject: [PATCH 2/2] Dir structure revamp, move stuff under src/ --- .gitignore | 2 ++ README.md | 4 ++-- integration-tests/hardhat.config.js | 4 ++-- integration-tests/test/base/backend.js | 10 +++++----- integration-tests/test/base/utils.js | 4 ++-- integration-tests/test/test_arbitrage.js | 8 ++++---- integration-tests/test/test_contract.js | 2 +- integration-tests/test/test_liquidator.js | 14 +++++++------- integration-tests/test/test_rollover.js | 10 +++++----- package.json | 12 ++++++------ {config => src/config}/abiComplete.js | 0 {config => src/config}/abiConverterRegistry.js | 0 {config => src/config}/abiIContractRegistry.js | 0 .../config}/abiLiquidityPoolV2Converter.js | 0 {config => src/config}/abiPriceFeed.js | 0 {config => src/config}/abiRBTCWrapperProxy.js | 0 {config => src/config}/abiSovrynSwapNetwork.js | 0 {config => src/config}/abiTestToken.js | 0 {config => src/config}/config.js | 0 {config => src/config}/config_mainnet.js | 0 {config => src/config}/config_testnet.js | 0 .../config}/config_testnet_testcontracts.js | 0 {controller => src/controller}/arbitrage.js | 0 {controller => src/controller}/common.js | 0 {controller => src/controller}/contract.js | 0 {controller => src/controller}/db.js | 2 +- {controller => src/controller}/liquidator.js | 0 {controller => src/controller}/main.js | 0 {controller => src/controller}/monitor.js | 0 {controller => src/controller}/rollover.js | 0 {controller => src/controller}/scanner.js | 0 {controller => src/controller}/wallet.js | 0 {models => src/models}/arbitrage.js | 0 {models => src/models}/baseModel.js | 0 {models => src/models}/liquidator.js | 0 {models => src/models}/rollover.js | 0 {public => src/public}/src/index.html | 0 {public => src/public}/src/index.js | 0 {public => src/public}/src/initWeb3.js | 0 {public => src/public}/src/styles.css | 0 {public => src/public}/webpack.config.ts | 8 ++++---- start.js => src/start.js | 2 +- {util => src/util}/account.js | 0 {util => src/util}/approval.js | 0 {util => src/util}/contractinfo.js | 0 {util => src/util}/encryptAccounts.js | 0 {util => src/util}/helper.js | 0 {util => src/util}/tradeCtrl.js | 0 tests/encrypt.js | 4 ++-- tests/telegrambot.js | 2 +- tests/test_api.js | 2 +- tests/test_arbitrage.js | 2 +- tests/test_contract.js | 2 +- tests/test_liquidations.js | 16 ++++++++-------- tests/test_node.js | 4 ++-- tests/test_rollover.js | 14 +++++++------- tests/test_scanner.js | 10 +++++----- tests/test_wallets.js | 10 +++++----- tsconfig.json | 2 +- 59 files changed, 76 insertions(+), 74 deletions(-) rename {config => src/config}/abiComplete.js (100%) rename {config => src/config}/abiConverterRegistry.js (100%) rename {config => src/config}/abiIContractRegistry.js (100%) rename {config => src/config}/abiLiquidityPoolV2Converter.js (100%) rename {config => src/config}/abiPriceFeed.js (100%) rename {config => src/config}/abiRBTCWrapperProxy.js (100%) rename {config => src/config}/abiSovrynSwapNetwork.js (100%) rename {config => src/config}/abiTestToken.js (100%) rename {config => src/config}/config.js (100%) rename {config => src/config}/config_mainnet.js (100%) rename {config => src/config}/config_testnet.js (100%) rename {config => src/config}/config_testnet_testcontracts.js (100%) rename {controller => src/controller}/arbitrage.js (100%) rename {controller => src/controller}/common.js (100%) rename {controller => src/controller}/contract.js (100%) rename {controller => src/controller}/db.js (98%) rename {controller => src/controller}/liquidator.js (100%) rename {controller => src/controller}/main.js (100%) rename {controller => src/controller}/monitor.js (100%) rename {controller => src/controller}/rollover.js (100%) rename {controller => src/controller}/scanner.js (100%) rename {controller => src/controller}/wallet.js (100%) rename {models => src/models}/arbitrage.js (100%) rename {models => src/models}/baseModel.js (100%) rename {models => src/models}/liquidator.js (100%) rename {models => src/models}/rollover.js (100%) rename {public => src/public}/src/index.html (100%) rename {public => src/public}/src/index.js (100%) rename {public => src/public}/src/initWeb3.js (100%) rename {public => src/public}/src/styles.css (100%) rename {public => src/public}/webpack.config.ts (79%) rename start.js => src/start.js (92%) rename {util => src/util}/account.js (100%) rename {util => src/util}/approval.js (100%) rename {util => src/util}/contractinfo.js (100%) rename {util => src/util}/encryptAccounts.js (100%) rename {util => src/util}/helper.js (100%) rename {util => src/util}/tradeCtrl.js (100%) diff --git a/.gitignore b/.gitignore index 5b66f59..35a5f7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ node_modules +src/public/dist public/dist +src/secrets/ /secrets/ logs package-lock.json diff --git a/README.md b/README.md index 2529f09..7eba946 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Webpack 2. npm install -g mocha nodemon 3. To build the client create an empty directory "public/dist" and run "npm run build-client" 4. Create empty directories "logs" and "db" in the project root -5. Create directory "secrets" and within a file accounts.js with the credentials of the liquidator/rollover/arbitrage wallets +5. Create directory "src/secrets" and within a file accounts.js with the credentials of the liquidator/rollover/arbitrage wallets ks = encrypted keystore file in v3 standard. (alternatively, you can specify pKey instead of ks to just use the private key) @@ -65,7 +65,7 @@ export default "[telegram-bot-token]"; export default ""; for no notifications 6. Charge the Sovryn node wallets with all relevant tokens and enough Rbtc to cover tx cost. -7. Execute node -r esm util/approval.js to approve the Sovryn smart contract to spend Doc on behalf of the Sovryn node wallets as well as the swap network contract to spend tokens on behalf of the arbitrage wallet. +7. Execute npm run approve:[main || test] to approve the Sovryn smart contract to spend Doc on behalf of the Sovryn node wallets as well as the swap network contract to spend tokens on behalf of the arbitrage wallet. ``` diff --git a/integration-tests/hardhat.config.js b/integration-tests/hardhat.config.js index 73a4c9a..d474727 100644 --- a/integration-tests/hardhat.config.js +++ b/integration-tests/hardhat.config.js @@ -8,13 +8,13 @@ require('chai') // monkey-patch these at the earliest opportunity, otherwise initializing controller/Contract.js // will fail if you have "ks" anywhere -import accounts from '../secrets/accounts'; +import accounts from '../src/secrets/accounts'; accounts.liquidator = []; accounts.rollover = []; accounts.arbitrage = []; // monkey-patch these too, to be sure. -import conf from '../config/config'; +import conf from '../src/config/config'; conf.nodeProvider = 'http://example.invalid'; conf.publicNodeProvider = 'http://example.invalid'; conf.errorBotTelegram = undefined; diff --git a/integration-tests/test/base/backend.js b/integration-tests/test/base/backend.js index f9886d4..d1a4e73 100644 --- a/integration-tests/test/base/backend.js +++ b/integration-tests/test/base/backend.js @@ -1,9 +1,9 @@ import { constants } from "@openzeppelin/test-helpers"; -import conf from '../../../config/config'; -import C from '../../../controller/contract'; -import Wallet from '../../../controller/wallet'; -import A from '../../../secrets/accounts'; -import db from '../../../controller/db'; +import conf from '../../../src/config/config'; +import C from '../../../src/controller/contract'; +import Wallet from '../../../src/controller/wallet'; +import A from '../../../src/secrets/accounts'; +import db from '../../../src/controller/db'; import {existsSync, unlinkSync} from 'fs'; /** diff --git a/integration-tests/test/base/utils.js b/integration-tests/test/base/utils.js index 988b00c..77b4c8e 100644 --- a/integration-tests/test/base/utils.js +++ b/integration-tests/test/base/utils.js @@ -1,6 +1,6 @@ -import C from '../../../controller/contract'; +import C from '../../../src/controller/contract'; const { BN } = require("@openzeppelin/test-helpers"); -import abiTestToken from '../../../config/abiTestToken'; +import abiTestToken from '../../../src/config/abiTestToken'; import {ether} from "@openzeppelin/test-helpers"; export async function transferAlmostAllRbtc({ diff --git a/integration-tests/test/test_arbitrage.js b/integration-tests/test/test_arbitrage.js index f9e1fbe..17af6b7 100644 --- a/integration-tests/test/test_arbitrage.js +++ b/integration-tests/test/test_arbitrage.js @@ -2,10 +2,10 @@ import { expect } from 'chai'; import { BN, ether, constants } from '@openzeppelin/test-helpers'; const { MAX_UINT256 } = constants; -import A from '../../secrets/accounts'; -import Arbitrage from '../../controller/arbitrage'; -import DB from '../../controller/db'; -import conf from '../../config/config'; +import A from '../../src/secrets/accounts'; +import Arbitrage from '../../src/controller/arbitrage'; +import DB from '../../src/controller/db'; +import conf from '../../src/config/config'; import {initSovrynNodeForTesting} from "./base/backend"; import {initSovrynContracts, ConverterHelper} from "./base/contracts"; diff --git a/integration-tests/test/test_contract.js b/integration-tests/test/test_contract.js index 72f0f0c..2f4df08 100644 --- a/integration-tests/test/test_contract.js +++ b/integration-tests/test/test_contract.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { BN } from '@openzeppelin/test-helpers'; -import Contract from '../../controller/contract'; +import Contract from '../../src/controller/contract'; import {initSovrynNodeForTesting} from "./base/backend"; import {initSovrynContracts, ConverterHelper} from "./base/contracts"; diff --git a/integration-tests/test/test_liquidator.js b/integration-tests/test/test_liquidator.js index 086e88b..a8a088f 100644 --- a/integration-tests/test/test_liquidator.js +++ b/integration-tests/test/test_liquidator.js @@ -2,13 +2,13 @@ import { expect } from 'chai'; import { BN, ether, constants } from '@openzeppelin/test-helpers'; import sinon from 'sinon'; -import A from '../../secrets/accounts'; -import Liquidator from '../../controller/liquidator'; -import Arbitrage from '../../controller/arbitrage'; -import C from '../../controller/contract'; -import PositionScanner from '../../controller/scanner'; -import U from '../../util/helper'; -import DB from '../../controller/db'; +import A from '../../src/secrets/accounts'; +import Liquidator from '../../src/controller/liquidator'; +import Arbitrage from '../../src/controller/arbitrage'; +import C from '../../src/controller/contract'; +import PositionScanner from '../../src/controller/scanner'; +import U from '../../src/util/helper'; +import DB from '../../src/controller/db'; const LoanOpeningsEvents = artifacts.require("LoanOpeningsEvents"); import {initSovrynNodeForTesting} from "./base/backend"; diff --git a/integration-tests/test/test_rollover.js b/integration-tests/test/test_rollover.js index f153008..bc6473b 100644 --- a/integration-tests/test/test_rollover.js +++ b/integration-tests/test/test_rollover.js @@ -2,11 +2,11 @@ import { expect } from 'chai'; import { BN } from '@openzeppelin/test-helpers'; import sinon from 'sinon'; -import A from '../../secrets/accounts'; -import Rollover from '../../controller/rollover'; -import C from '../../controller/contract'; -import PositionScanner from '../../controller/scanner'; -import DB from '../../controller/db'; +import A from '../../src/secrets/accounts'; +import Rollover from '../../src/controller/rollover'; +import C from '../../src/controller/contract'; +import PositionScanner from '../../src/controller/scanner'; +import DB from '../../src/controller/db'; const LoanOpeningsEvents = artifacts.require("LoanOpeningsEvents"); import {initSovrynNodeForTesting} from "./base/backend"; diff --git a/package.json b/package.json index ac3eadd..7b8edff 100644 --- a/package.json +++ b/package.json @@ -6,12 +6,12 @@ "scripts": { "test-lx": "mocha -r ts-node/register ./tests/test_liquidations.js --timeout 2500000", "test-network": "node -r ts-node/register ./tests/network.js", - "start:test": "nodemon -r ts-node/register start.js testnet", - "start:main": "nodemon -r ts-node/register start.js mainnet", - "dev": "npx webpack-dev-server --open --config ./public/webpack.config.ts", - "build-client": "npx webpack --config ./public/webpack.config.ts", - "approveWalletsMain": "node -r ts-node/register ./util/approval.js mainnet", - "approveWalletsTest": "node -r ts-node/register ./util/approval.js testnet" + "start:test": "nodemon -r ts-node/register ./src/start.js testnet", + "start:main": "nodemon -r ts-node/register ./src/start.js mainnet", + "dev": "npx webpack-dev-server --open --config ./src/public/webpack.config.ts", + "build-client": "npx webpack --config ./src/public/webpack.config.ts", + "approve:main": "node -r ts-node/register ./src/util/approval.js mainnet", + "approve:test": "node -r ts-node/register ./src/util/approval.js testnet" }, "author": "", "license": "ISC", diff --git a/config/abiComplete.js b/src/config/abiComplete.js similarity index 100% rename from config/abiComplete.js rename to src/config/abiComplete.js diff --git a/config/abiConverterRegistry.js b/src/config/abiConverterRegistry.js similarity index 100% rename from config/abiConverterRegistry.js rename to src/config/abiConverterRegistry.js diff --git a/config/abiIContractRegistry.js b/src/config/abiIContractRegistry.js similarity index 100% rename from config/abiIContractRegistry.js rename to src/config/abiIContractRegistry.js diff --git a/config/abiLiquidityPoolV2Converter.js b/src/config/abiLiquidityPoolV2Converter.js similarity index 100% rename from config/abiLiquidityPoolV2Converter.js rename to src/config/abiLiquidityPoolV2Converter.js diff --git a/config/abiPriceFeed.js b/src/config/abiPriceFeed.js similarity index 100% rename from config/abiPriceFeed.js rename to src/config/abiPriceFeed.js diff --git a/config/abiRBTCWrapperProxy.js b/src/config/abiRBTCWrapperProxy.js similarity index 100% rename from config/abiRBTCWrapperProxy.js rename to src/config/abiRBTCWrapperProxy.js diff --git a/config/abiSovrynSwapNetwork.js b/src/config/abiSovrynSwapNetwork.js similarity index 100% rename from config/abiSovrynSwapNetwork.js rename to src/config/abiSovrynSwapNetwork.js diff --git a/config/abiTestToken.js b/src/config/abiTestToken.js similarity index 100% rename from config/abiTestToken.js rename to src/config/abiTestToken.js diff --git a/config/config.js b/src/config/config.js similarity index 100% rename from config/config.js rename to src/config/config.js diff --git a/config/config_mainnet.js b/src/config/config_mainnet.js similarity index 100% rename from config/config_mainnet.js rename to src/config/config_mainnet.js diff --git a/config/config_testnet.js b/src/config/config_testnet.js similarity index 100% rename from config/config_testnet.js rename to src/config/config_testnet.js diff --git a/config/config_testnet_testcontracts.js b/src/config/config_testnet_testcontracts.js similarity index 100% rename from config/config_testnet_testcontracts.js rename to src/config/config_testnet_testcontracts.js diff --git a/controller/arbitrage.js b/src/controller/arbitrage.js similarity index 100% rename from controller/arbitrage.js rename to src/controller/arbitrage.js diff --git a/controller/common.js b/src/controller/common.js similarity index 100% rename from controller/common.js rename to src/controller/common.js diff --git a/controller/contract.js b/src/controller/contract.js similarity index 100% rename from controller/contract.js rename to src/controller/contract.js diff --git a/controller/db.js b/src/controller/db.js similarity index 98% rename from controller/db.js rename to src/controller/db.js index 58dd311..13ca391 100644 --- a/controller/db.js +++ b/src/controller/db.js @@ -14,7 +14,7 @@ class DbCtrl { async initDb(dbName) { return new Promise(resolve => { - const file = path.join(__dirname, '../db/' + dbName); + const file = path.join(__dirname, '../../db/' + dbName); this.db = new sqlite3.Database(file, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => { if (err) { console.error(err.message, file); diff --git a/controller/liquidator.js b/src/controller/liquidator.js similarity index 100% rename from controller/liquidator.js rename to src/controller/liquidator.js diff --git a/controller/main.js b/src/controller/main.js similarity index 100% rename from controller/main.js rename to src/controller/main.js diff --git a/controller/monitor.js b/src/controller/monitor.js similarity index 100% rename from controller/monitor.js rename to src/controller/monitor.js diff --git a/controller/rollover.js b/src/controller/rollover.js similarity index 100% rename from controller/rollover.js rename to src/controller/rollover.js diff --git a/controller/scanner.js b/src/controller/scanner.js similarity index 100% rename from controller/scanner.js rename to src/controller/scanner.js diff --git a/controller/wallet.js b/src/controller/wallet.js similarity index 100% rename from controller/wallet.js rename to src/controller/wallet.js diff --git a/models/arbitrage.js b/src/models/arbitrage.js similarity index 100% rename from models/arbitrage.js rename to src/models/arbitrage.js diff --git a/models/baseModel.js b/src/models/baseModel.js similarity index 100% rename from models/baseModel.js rename to src/models/baseModel.js diff --git a/models/liquidator.js b/src/models/liquidator.js similarity index 100% rename from models/liquidator.js rename to src/models/liquidator.js diff --git a/models/rollover.js b/src/models/rollover.js similarity index 100% rename from models/rollover.js rename to src/models/rollover.js diff --git a/public/src/index.html b/src/public/src/index.html similarity index 100% rename from public/src/index.html rename to src/public/src/index.html diff --git a/public/src/index.js b/src/public/src/index.js similarity index 100% rename from public/src/index.js rename to src/public/src/index.js diff --git a/public/src/initWeb3.js b/src/public/src/initWeb3.js similarity index 100% rename from public/src/initWeb3.js rename to src/public/src/initWeb3.js diff --git a/public/src/styles.css b/src/public/src/styles.css similarity index 100% rename from public/src/styles.css rename to src/public/src/styles.css diff --git a/public/webpack.config.ts b/src/public/webpack.config.ts similarity index 79% rename from public/webpack.config.ts rename to src/public/webpack.config.ts index 247d631..544d134 100644 --- a/public/webpack.config.ts +++ b/src/public/webpack.config.ts @@ -3,9 +3,9 @@ const CopyPlugin = require('copy-webpack-plugin'); module.exports = { entry: [ - './public/src/initWeb3.js', - './public/src/index.js', - './public/src/styles.css' + `${__dirname}/src/initWeb3.js`, + `${__dirname}/src/index.js`, + `${__dirname}/src/styles.css` ], devtool: 'inline-source-map', devServer: { @@ -24,7 +24,7 @@ module.exports = { plugins: [ new CopyPlugin({ patterns: [ - {from: 'public/src/index.html'} + {from: `${__dirname}/src/index.html`} ] }), ], diff --git a/start.js b/src/start.js similarity index 92% rename from start.js rename to src/start.js index be75e3d..8b6a1ad 100644 --- a/start.js +++ b/src/start.js @@ -15,7 +15,7 @@ monitor({ port: conf.healthMonitorPort }); -app.use('/', express.static('public/dist')); +app.use('/', express.static('../public/dist')); http.listen(conf.serverPort, () => { console.log('listening on *:'+conf.serverPort); }); diff --git a/util/account.js b/src/util/account.js similarity index 100% rename from util/account.js rename to src/util/account.js diff --git a/util/approval.js b/src/util/approval.js similarity index 100% rename from util/approval.js rename to src/util/approval.js diff --git a/util/contractinfo.js b/src/util/contractinfo.js similarity index 100% rename from util/contractinfo.js rename to src/util/contractinfo.js diff --git a/util/encryptAccounts.js b/src/util/encryptAccounts.js similarity index 100% rename from util/encryptAccounts.js rename to src/util/encryptAccounts.js diff --git a/util/helper.js b/src/util/helper.js similarity index 100% rename from util/helper.js rename to src/util/helper.js diff --git a/util/tradeCtrl.js b/src/util/tradeCtrl.js similarity index 100% rename from util/tradeCtrl.js rename to src/util/tradeCtrl.js diff --git a/tests/encrypt.js b/tests/encrypt.js index 9fdf818..a290873 100644 --- a/tests/encrypt.js +++ b/tests/encrypt.js @@ -1,7 +1,7 @@ import Web3 from 'web3'; -import conf from '../config/config'; -import wallets from '../secrets/accounts'; +import conf from '../src/config/config'; +import wallets from '../src/secrets/accounts'; var web3 = new Web3(conf.nodeProvider); diff --git a/tests/telegrambot.js b/tests/telegrambot.js index bdd7632..8661c67 100644 --- a/tests/telegrambot.js +++ b/tests/telegrambot.js @@ -2,7 +2,7 @@ * Testing telegram bot api */ -import c from '../config/config'; +import c from '../src/config/config'; const Telegram = require('telegraf/telegram'); console.log("start bot "+c.errorBotTelegram) diff --git a/tests/test_api.js b/tests/test_api.js index 68f269f..e71fa8d 100644 --- a/tests/test_api.js +++ b/tests/test_api.js @@ -1,7 +1,7 @@ /** * Api tester */ -import c from '../config/config_testnet'; +import c from '../src/config/config_testnet'; import io from 'socket.io-client'; const assert = require('assert'); diff --git a/tests/test_arbitrage.js b/tests/test_arbitrage.js index da832c7..4e8a455 100644 --- a/tests/test_arbitrage.js +++ b/tests/test_arbitrage.js @@ -6,7 +6,7 @@ import conf from '../config/config'; import C from '../controller/contract'; import Arbitrage from '../controller/arbitrage'; const assert = require('assert'); -import db from "../controller/db"; +import db from "../src/controller/db"; var pPriceFeed, pAmm; describe('Arbitrage', async () => { diff --git a/tests/test_contract.js b/tests/test_contract.js index b0d51af..478bc42 100644 --- a/tests/test_contract.js +++ b/tests/test_contract.js @@ -2,7 +2,7 @@ * Tests for the Contract helper * Set config file in /config.config.js manually because mocha.js overwrites process.arg */ -import C from '../controller/contract'; +import C from '../src/controller/contract'; const assert = require('assert'); describe('Contract', () => { diff --git a/tests/test_liquidations.js b/tests/test_liquidations.js index 3c15fc2..0af4889 100644 --- a/tests/test_liquidations.js +++ b/tests/test_liquidations.js @@ -6,16 +6,16 @@ * Set test/mainnet in file /config.config.js manually because mocha.js overwrites process.arg */ -import conf from '../config/config'; +import conf from '../src/config/config'; -import abiComplete from '../config/abiComplete'; +import abiComplete from '../src/config/abiComplete'; import abiLoanToken from './abi/abiLoanToken'; -import C from '../controller/contract'; -import A from '../secrets/accounts'; -import Liquidator from '../controller/liquidator'; -import PosScanner from '../controller/scanner'; -import Wallet from '../controller/wallet'; -import common from '../controller/common' +import C from '../src/controller/contract'; +import A from '../src/secrets/accounts'; +import Liquidator from '../src/controller/liquidator'; +import PosScanner from '../src/controller/scanner'; +import Wallet from '../src/controller/wallet'; +import common from '../src/controller/common' const abiDecoder = require('abi-decoder'); const assert = require('assert'); diff --git a/tests/test_node.js b/tests/test_node.js index faabf22..9bbb542 100644 --- a/tests/test_node.js +++ b/tests/test_node.js @@ -2,8 +2,8 @@ * general tests for interacting with the node. */ -import c from '../config/config_testnet'; -import abiComplete from '../config/abiComplete'; +import c from '../src/config/config_testnet'; +import abiComplete from '../src/config/abiComplete'; import abiLoanToken from './abi/abiLoanToken'; import abiLoanOpeningEvents from './abi/abiLoanOpeningEvents'; import Web3 from 'web3'; diff --git a/tests/test_rollover.js b/tests/test_rollover.js index f254978..eb27cef 100644 --- a/tests/test_rollover.js +++ b/tests/test_rollover.js @@ -5,13 +5,13 @@ * * Set config file in /config.config.js manually because mocha.js overwrites process.arg */ -import conf from '../config/config'; -import abiComplete from '../config/abiComplete'; -import A from '../secrets/accounts'; -import C from '../controller/contract'; -import Rollover from '../controller/rollover'; -import PosScanner from '../controller/scanner'; -import Wallet from '../controller/wallet'; +import conf from '../src/config/config'; +import abiComplete from '../src/config/abiComplete'; +import A from '../src/secrets/accounts'; +import C from '../src/controller/contract'; +import Rollover from '../src/controller/rollover'; +import PosScanner from '../src/controller/scanner'; +import Wallet from '../src/controller/wallet'; import abiLoanToken from './abi/abiLoanToken'; const assert = require('assert'); diff --git a/tests/test_scanner.js b/tests/test_scanner.js index d27907a..db9d8d9 100644 --- a/tests/test_scanner.js +++ b/tests/test_scanner.js @@ -2,14 +2,14 @@ * Test the position scanner loop * Set config file in /config.config.js manually because mocha.js overwrites process.arg */ -import abiComplete from '../config/abiComplete'; -import PosScanner from '../controller/scanner'; -import C from '../controller/contract'; -import common from '../controller/common' +import abiComplete from '../src/config/abiComplete'; +import PosScanner from '../src/controller/scanner'; +import C from '../src/controller/contract'; +import common from '../src/controller/common' const assert = require('assert'); const abiDecoder = require('abi-decoder'); abiDecoder.addABI(abiComplete); -import config from "../config/config"; +import config from "../src/config/config"; let positions = {} let liquidations = {}; diff --git a/tests/test_wallets.js b/tests/test_wallets.js index 4c285e7..c377ac7 100644 --- a/tests/test_wallets.js +++ b/tests/test_wallets.js @@ -3,11 +3,11 @@ * Set config file in /config.config.js manually because mocha.js overwrites process.arg */ const assert = require('assert'); -import conf from '../config/config'; -import C from '../controller/contract'; -import A from '../secrets/accounts'; -import Wallet from '../controller/wallet'; -import U from '../util/helper'; +import conf from '../src/config/config'; +import C from '../src/controller/contract'; +import A from '../src/secrets/accounts'; +import Wallet from '../src/controller/wallet'; +import U from '../src/util/helper'; var liqQueue={}; diff --git a/tsconfig.json b/tsconfig.json index c561885..58a852e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "esModuleInterop": true, "allowJs": true, }, - "include": ["./**/*"], + "include": ["./src/**/*"], "exclude": ["./integration-tests/**/*"] }