From 2c105fde1f8f6814265a5b99f3650482f759ef39 Mon Sep 17 00:00:00 2001
From: viktor <baranov.viktor.27@gmail.com>
Date: Fri, 17 Nov 2017 16:54:18 +0300
Subject: [PATCH] Garbage collection

---
 assets/javascripts/application.js               | 17 ++---------------
 .../javascripts/application/blockchainHelper.js | 12 ------------
 assets/javascripts/application/getValidators.js |  5 ++---
 3 files changed, 4 insertions(+), 30 deletions(-)
 mode change 100644 => 100755 assets/javascripts/application.js

diff --git a/assets/javascripts/application.js b/assets/javascripts/application.js
old mode 100644
new mode 100755
index 302181d..af2e2e0
--- a/assets/javascripts/application.js
+++ b/assets/javascripts/application.js
@@ -13,18 +13,6 @@ function SHA3Encrypt(web3, str) {
   return strEncode;
 }
 
-function estimateGas(web3, acc, contractAddr, data, cb) {
-  web3.eth.estimateGas({
-      from: acc, 
-      data: data,
-      to: contractAddr
-  }, function(err, estimatedGas) {
-    console.log(err);
-    console.log(estimatedGas);
-    cb(estimatedGas);
-  });
-}
-
 function call(web3, acc, contractAddr, data, cb) {
   let props;
   if (acc) props = { from: acc, data: data, to: contractAddr };
@@ -328,7 +316,7 @@ function getValidators(web3, func, contractAddress, disabled, cb) {
 		var validatorsArray = [];
 		var item = "";
 		for (var i = 0; i < validatorsResp.length; i++) {
-			item+=validatorsResp[i];
+			item += validatorsResp[i];
 			if ((i + 1) % 64 == 0) {
 				item = item.substr(item.length - 40, 40);
 				validatorsArray.push(item);
@@ -339,8 +327,7 @@ function getValidators(web3, func, contractAddress, disabled, cb) {
 		validatorsArray.shift(); //number of elements
 
 		if (validatorsArray.length == 0) {
-			cb(validatorsArray);
-			return;
+			return cb(validatorsArray);
 		}
 
 		var validatorsArrayOut = [];
diff --git a/assets/javascripts/application/blockchainHelper.js b/assets/javascripts/application/blockchainHelper.js
index 6051663..e8c9ad4 100755
--- a/assets/javascripts/application/blockchainHelper.js
+++ b/assets/javascripts/application/blockchainHelper.js
@@ -3,18 +3,6 @@ function SHA3Encrypt(web3, str) {
   return strEncode;
 }
 
-function estimateGas(web3, acc, contractAddr, data, cb) {
-  web3.eth.estimateGas({
-      from: acc, 
-      data: data,
-      to: contractAddr
-  }, function(err, estimatedGas) {
-    console.log(err);
-    console.log(estimatedGas);
-    cb(estimatedGas);
-  });
-}
-
 function call(web3, acc, contractAddr, data, cb) {
   let props;
   if (acc) props = { from: acc, data: data, to: contractAddr };
diff --git a/assets/javascripts/application/getValidators.js b/assets/javascripts/application/getValidators.js
index b649aea..01af095 100644
--- a/assets/javascripts/application/getValidators.js
+++ b/assets/javascripts/application/getValidators.js
@@ -9,7 +9,7 @@ function getValidators(web3, func, contractAddress, disabled, cb) {
 		var validatorsArray = [];
 		var item = "";
 		for (var i = 0; i < validatorsResp.length; i++) {
-			item+=validatorsResp[i];
+			item += validatorsResp[i];
 			if ((i + 1) % 64 == 0) {
 				item = item.substr(item.length - 40, 40);
 				validatorsArray.push(item);
@@ -20,8 +20,7 @@ function getValidators(web3, func, contractAddress, disabled, cb) {
 		validatorsArray.shift(); //number of elements
 
 		if (validatorsArray.length == 0) {
-			cb(validatorsArray);
-			return;
+			return cb(validatorsArray);
 		}
 
 		var validatorsArrayOut = [];