Merge branch 'hotfix/0.2.2'

Additional fixes to support Truffle and Solidity v5.
luciditytech · Feb 8, 2019 · 020ed08 · 020ed08
2 parents 7100ac9 + 85d5790
commit 020ed08
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.2.2] - 2019-02-07
+### Fixed 
+- Additional fixes to support Truffle and Solidity v5.
+- Fix liner errors.
+
+## [0.2.1] - 2019-02-07
+### Fixed 
+- Fix version number in `package.json`.
+
 ## [0.2.0] - 2019-02-07
 ### Changed
 - Upgrade dependencies versions to newest

diff --git a/ministro-utils/expectedExceptionPromise.js b/ministro-utils/expectedExceptionPromise.js
@@ -52,4 +52,4 @@ module.exports = function expectedExceptionPromise(action, gasToUse) {
         }
       },
     );
-}
+};
diff --git a/ministro-utils/getTransactionReceiptMined.js b/ministro-utils/getTransactionReceiptMined.js
@@ -1,4 +1,4 @@
-module.exports = function getTransactionReceiptMined(txHash, interval) {
+function getTransactionReceiptMined(txHash, interval) {
   const self = this;
   const transactionReceiptAsync = (resolve, reject) => {
     self.getTransactionReceipt(txHash, (error, receipt) => {
@@ -21,6 +21,8 @@ module.exports = function getTransactionReceiptMined(txHash, interval) {
     return new Promise(transactionReceiptAsync);
   }
   throw new Error(`Invalid Type: ${txHash}`);
-};
+}
 
 web3.eth.getTransactionReceiptMined = getTransactionReceiptMined;
+
+module.exports = getTransactionReceiptMined;
diff --git a/ministro-utils/ministroExecute.js b/ministro-utils/ministroExecute.js
@@ -1,12 +1,8 @@
 const Web3Utils = require('web3-utils');
-const { ethGetBalance } = require('./web3');
 const expectedExceptionPromise = require('./expectedExceptionPromise');
 const txCheck = require('./txCheck');
 const txEvents = require('./txEvents');
 
-// this is just to know, how much chars cen we put in one line
-const lineLength = 118;
-const debug = 0;
 
 /**
  * @dev Idea for this function is to be called from test/ministro-contracts/*
@@ -44,19 +40,7 @@ module.exports = function ministroExecute() {
   };
 
   app.setFromVar = async (_from) => {
-    let balance;
     txAttrSaved.from = _from;
-
-    try {
-      balance = await ethGetBalance(_from);
-    } catch (e) {
-      console.log('errors', e);
-    }
-
-    balance = parseFloat(web3.fromWei(balance.toString(10), 'ether'));
-
-    process.stderr.write(`${' '.repeat(lineLength)}\r`);
-    if (debug) console.log('[ministroExecute] new `txAttr.from` balance', balance, 'ETH');
   };
 
   // @param _txAttr - (optional) can be empty or can be object with transaction parameters like:

diff --git a/ministro-utils/web3.js b/ministro-utils/web3.js
@@ -2,11 +2,9 @@ const pify = require('pify');
 
 const Web3 = require('web3');
 
-const web3 = new Web3(Web3.currentProvider || 'http://localhost:8545');
-
-const ethAsync = pify(web3.eth);
+const web3 = new Web3(Web3.givenProvider || 'ws://localhost:8545');
 
 module.exports = {
-  ethGetBalance: ethAsync.getBalance,
-  ethGetTransactionReceipt: ethAsync.getTransactionReceipt,
+  ethGetBalance: pify(web3.eth.getBalance),
+  ethGetTransactionReceipt: pify(web3.eth.getTransactionReceipt),
 };
diff --git a/package.json b/package.json
@@ -1,11 +1,13 @@
 {
   "name": "ministro-tool",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "JavaScript tool created for helping in process of testing solidity smart contracts.",
   "main": "ministro-utils/index.js",
   "scripts": {
     "test": "scripts/test.sh",
-    "lint": "./node_modules/.bin/eslint ./test --no-ignore --ext .js --fix"
+    "lint:test": "./node_modules/.bin/eslint ./test --no-ignore --ext .js --fix",
+    "lint:src": "./node_modules/.bin/eslint ./ministro-utils --no-ignore --ext .js --fix",
+    "lint": "npm run lint:test && npm run lint:src"
   },
   "repository": {
     "type": "git",
-Original file line number
+Diff line change
@@ Expand Up @@
             }
           },
         );
-    }
+    };