aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry <dimitry@ethdev.com>2017-03-14 21:51:10 +0800
committerDimitry <dimitry@ethdev.com>2017-03-14 21:51:10 +0800
commit4684c32e8aa8882049e864c5c0edd399a137c7b0 (patch)
treea0d62f9961e510e2041581354b23375e153c1f95
parenteb245faed55fe482b3eb47d451c3b67b01bd72fb (diff)
downloaddexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.tar
dexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.tar.gz
dexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.tar.bz2
dexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.tar.lz
dexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.tar.xz
dexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.tar.zst
dexon-tests-4684c32e8aa8882049e864c5c0edd399a137c7b0.zip
check eth path
remove unneeded packages
-rw-r--r--RPCTests/main.js6
-rw-r--r--RPCTests/modules/utils.js7
-rw-r--r--RPCTests/package.json8
-rw-r--r--RPCTests/scripts/addPeer.js1
4 files changed, 15 insertions, 7 deletions
diff --git a/RPCTests/main.js b/RPCTests/main.js
index 52f1b408d..fce4327d2 100644
--- a/RPCTests/main.js
+++ b/RPCTests/main.js
@@ -16,6 +16,12 @@ var dynamic = {};
function cb(){}
function main()
{
+if (!ethpath || !utils.fileExists(ethpath))
+{
+ utils.cLog("Executable '" + ethpath + "' not found!");
+ utils.cLog("Please, set eth path. Usage: node main.js <ethpath>");
+ return;
+}
testutils.readTestsInFolder(workdir + "/scripts/tests");
async.series([
diff --git a/RPCTests/modules/utils.js b/RPCTests/modules/utils.js
index 5d32ec771..0d0f2b02f 100644
--- a/RPCTests/modules/utils.js
+++ b/RPCTests/modules/utils.js
@@ -37,6 +37,13 @@ module.exports = {
}
},
+ fileExists: function fileExists(path)
+ {
+ if(fs.existsSync(path))
+ return true;
+ return false;
+ },
+
readFile: function readFile(path, callback, cb) {
fs.readFile(path, 'utf8', (err, data) => { callback (err, data, cb) });
},
diff --git a/RPCTests/package.json b/RPCTests/package.json
index aeb1c2755..2e3283a2b 100644
--- a/RPCTests/package.json
+++ b/RPCTests/package.json
@@ -8,7 +8,7 @@
"async": "^1.5"
},
"scripts": {
-
+
},
"repository": {
@@ -24,10 +24,6 @@
"node_modules/*",
"build/*",
"test/resources/*"
- ],
- "parser": "babel-eslint"
- },
- "browserify": {
- "transform": ["babelify"]
+ ]
}
}
diff --git a/RPCTests/scripts/addPeer.js b/RPCTests/scripts/addPeer.js
deleted file mode 100644
index 3da731748..000000000
--- a/RPCTests/scripts/addPeer.js
+++ /dev/null
@@ -1 +0,0 @@
-web3.admin.addPeer("enode://" + args[0], function(err, res){ callback(err, res); })