From 092ea42e69a04ac86e8196c19ce00e85c5813a50 Mon Sep 17 00:00:00 2001
From: viktor <baranov.viktor.27@gmail.com>
Date: Fri, 16 Feb 2018 17:09:02 +0300
Subject: [PATCH] ESLint suggestions

---
 generateInitialKey/test/test.js             | 11 ++++-------
 generateInitialKey/utils/configureWeb3.js   | 12 ++++++------
 generateInitialKey/utils/generateAddress.js |  2 --
 submodules/poa-test-setup                   |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/generateInitialKey/test/test.js b/generateInitialKey/test/test.js
index 0ccf9aa..4eacf15 100644
--- a/generateInitialKey/test/test.js
+++ b/generateInitialKey/test/test.js
@@ -6,6 +6,7 @@ const EthereumTx = require('ethereumjs-tx');
 const assert = require('assert');
 const generateInitialKey = require('../generateInitialKey');
 const configureWeb3 = require('../utils/configureWeb3');
+const errorFinish = require('../utils/errorResponse');
 const getConfig = require('../utils/getConfig');
 const constants = require('../utils/constants');
 
@@ -58,6 +59,7 @@ describe("Initial key generation", async function() {
 		var privateKey = keythereum.recover(password, keyStore);
 		const privateKeyHex = Buffer.from(privateKey, 'hex')
 
+		let config;
 		try { config = await getConfig() }
 		catch (err) { return errorFinish(err); }
 
@@ -126,7 +128,7 @@ function getOutput() {
 		    		keyStorePath = file
 		    		try { keyStore = await checkKeyStoreFile(file) }
 					catch (err) { return reject(err) }
-		    	} else if (ext = keyExt) {
+		    	} else if (ext == keyExt) {
 		    		passwordPath = file
 		    		try { password = await readFile(file) }
 					catch (err) { return reject(err) }
@@ -139,6 +141,7 @@ function getOutput() {
 
 function checkKeyStoreFile(file) {
 	return new Promise(async (resolve, reject) => {
+		let content;
 		try { content = await readFile(file) }
 		catch (err) { return reject(err) }
 
@@ -160,12 +163,6 @@ function readFile(file) {
 	});
 }
 
-function sendRawTX() {
-	web3.eth.sendRawTransaction("0x" + serializedTx.toString('hex'), function(err, hash) {
-			sendRawTransactionResponse(err, hash, response);
-		});
-}
-
 function returnError(err) {
 	fs.unlinkSync(keyStorePath)
 	fs.unlinkSync(passwordPath)
diff --git a/generateInitialKey/utils/configureWeb3.js b/generateInitialKey/utils/configureWeb3.js
index c699af6..8681362 100644
--- a/generateInitialKey/utils/configureWeb3.js
+++ b/generateInitialKey/utils/configureWeb3.js
@@ -3,13 +3,13 @@ const { errorFinish } = require('./errorResponse');
 
 //configures web3
 function configureWeb3(rpc) {
-	let web3;
-	if (typeof web3 !== 'undefined') web3 = new Web3(web3.currentProvider);
-	else web3 = new Web3(new Web3.providers.HttpProvider(rpc));
-
-	if (!web3) return errorFinish(err);
-	
 	return new Promise((resolve, reject) => {
+		let web3;
+		if (typeof web3 !== 'undefined') web3 = new Web3(web3.currentProvider);
+		else web3 = new Web3(new Web3.providers.HttpProvider(rpc));
+
+		if (!web3) return reject({code: 500, title: "error", message: "web3 is undefined"});
+	
 		web3.eth.net.isListening()
 		.then(function(isListening) {
 			if (!isListening) {
diff --git a/generateInitialKey/utils/generateAddress.js b/generateInitialKey/utils/generateAddress.js
index bf616a2..c9a81cd 100644
--- a/generateInitialKey/utils/generateAddress.js
+++ b/generateInitialKey/utils/generateAddress.js
@@ -5,8 +5,6 @@ function generateAddress(password) {
 	return new Promise((resolve, reject) => {
 		let params = { keyBytes: 32, ivBytes: 16 };
 
-	  	let dk = keythereum.create(params);
-
 	  	keythereum.create(params, function (dk) {
 		    let options = {};
 		    keythereum.dump(password, dk.privateKey, dk.salt, dk.iv, options, function (keyObject) {
diff --git a/submodules/poa-test-setup b/submodules/poa-test-setup
index f1b8ff4..480c672 160000
--- a/submodules/poa-test-setup
+++ b/submodules/poa-test-setup
@@ -1 +1 @@
-Subproject commit f1b8ff4724027a2eff3b43c169ef6eda7522440a
+Subproject commit 480c67252272ce6d6e267154debd7f69e26cb2ea