From ef5a78a3cc6d636c34e39616e4dac440f905a8bb Mon Sep 17 00:00:00 2001 From: Mike Seese Date: Fri, 14 Aug 2020 17:45:57 -0700 Subject: [PATCH] move forking tests to a separate directory --- .../deployAfterFork.js} | 6 +++--- test/{ => forking}/forking.js | 12 ++++++------ .../forkingAsProvider.js} | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) rename test/{forking_deploy_after_fork.js => forking/deployAfterFork.js} (96%) rename test/{ => forking}/forking.js (98%) rename test/{forkingasprovider.js => forking/forkingAsProvider.js} (93%) diff --git a/test/forking_deploy_after_fork.js b/test/forking/deployAfterFork.js similarity index 96% rename from test/forking_deploy_after_fork.js rename to test/forking/deployAfterFork.js index 33793b1ef8..928f5fcc77 100644 --- a/test/forking_deploy_after_fork.js +++ b/test/forking/deployAfterFork.js @@ -2,9 +2,9 @@ var Web3 = require("web3"); var Web3WsProvider = require("web3-providers-ws"); var assert = require("assert"); var Ganache = require(process.env.TEST_BUILD - ? "../build/ganache.core." + process.env.TEST_BUILD + ".js" - : "../index.js"); -const compile = require("./helpers/contract/singleFileCompile"); + ? "../../build/ganache.core." + process.env.TEST_BUILD + ".js" + : "../../index.js"); +const compile = require("../helpers/contract/singleFileCompile"); var logger = { log: function(msg) { /* console.log(msg) */ diff --git a/test/forking.js b/test/forking/forking.js similarity index 98% rename from test/forking.js rename to test/forking/forking.js index c04087db36..ec3bcaa6c9 100644 --- a/test/forking.js +++ b/test/forking/forking.js @@ -1,14 +1,14 @@ -const Transaction = require("../lib/utils/transaction"); +const Transaction = require("../../lib/utils/transaction"); var Web3 = require("web3"); var Web3WsProvider = require("web3-providers-ws"); var assert = require("assert"); var Ganache = require(process.env.TEST_BUILD - ? "../build/ganache.core." + process.env.TEST_BUILD + ".js" - : "../index.js"); + ? "../../build/ganache.core." + process.env.TEST_BUILD + ".js" + : "../../index.js"); -const compile = require("./helpers/contract/singleFileCompile"); -var to = require("../lib/utils/to.js"); -var generateSend = require("./helpers/utils/rpc"); +const compile = require("../helpers/contract/singleFileCompile"); +var to = require("../../lib/utils/to.js"); +var generateSend = require("../helpers/utils/rpc"); var logger = { log: function(msg) { diff --git a/test/forkingasprovider.js b/test/forking/forkingAsProvider.js similarity index 93% rename from test/forkingasprovider.js rename to test/forking/forkingAsProvider.js index 08ba41c960..ba4c6894b2 100644 --- a/test/forkingasprovider.js +++ b/test/forking/forkingAsProvider.js @@ -1,6 +1,6 @@ const assert = require("assert"); -const bootstrap = require("./helpers/contract/bootstrap"); -const intializeTestProvider = require("./helpers/web3/initializeTestProvider"); +const bootstrap = require("../helpers/contract/bootstrap"); +const intializeTestProvider = require("../helpers/web3/initializeTestProvider"); /** * NOTE: Naming in these tests is a bit confusing. Here, the "main chain"