From 1f4e3dc8d5d19443fe4bf7b89733185fcfcc4b02 Mon Sep 17 00:00:00 2001
From: viktor <baranov.viktor.27@gmail.com>
Date: Thu, 23 Nov 2017 20:54:07 +0300
Subject: [PATCH] Refactoring

---
 assets/javascripts/application.js                 | 12 ++++++------
 assets/javascripts/application/checkInitialKey.js |  6 +++---
 assets/javascripts/application/createKeys.js      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assets/javascripts/application.js b/assets/javascripts/application.js
index 1cb56a4..23af361 100755
--- a/assets/javascripts/application.js
+++ b/assets/javascripts/application.js
@@ -91,13 +91,13 @@ function attachToContract(web3, abi, addr) {
   return contractInstance;
 }
 function checkInitialKey(web3, initialKey, contractAddr, abi, cb) {
-  let oraclesContract = attachToContract(web3, abi, contractAddr)
+  let KeysStorage = attachToContract(web3, abi, contractAddr)
   console.log("attach to oracles contract");
-  if (!oraclesContract) {
+  if (!KeysStorage) {
     return cb();
   }
 
-  oraclesContract.methods.checkInitialKey(initialKey).call(function(isNew) {
+  KeysStorage.methods.checkInitialKey(initialKey).call(function(isNew) {
     cb(isNew);
   })
 }
@@ -218,9 +218,9 @@ function bytesCount(s) {
 }
 function createKeys(web3, keys, contractAddr, abi, cb) {
   console.log("***Create keys function***");
-  let oraclesContract = attachToContract(web3, abi, contractAddr)
+  let KeysStorage = attachToContract(web3, abi, contractAddr)
   console.log("attach to oracles contract");
-  if (!oraclesContract) {
+  if (!KeysStorage) {
     return cb();
   }
 
@@ -229,7 +229,7 @@ function createKeys(web3, keys, contractAddr, abi, cb) {
   var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
   var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
   
-  oraclesContract.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address, 
+  KeysStorage.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address, 
     "0x" + keys.payoutKey.payoutKeyObject.address, 
     "0x" + keys.votingKey.votingKeyObject.address
   ).send(opts).on('error', error => {
diff --git a/assets/javascripts/application/checkInitialKey.js b/assets/javascripts/application/checkInitialKey.js
index 645a8ee..e16ca44 100755
--- a/assets/javascripts/application/checkInitialKey.js
+++ b/assets/javascripts/application/checkInitialKey.js
@@ -1,11 +1,11 @@
 function checkInitialKey(web3, initialKey, contractAddr, abi, cb) {
-  let oraclesContract = attachToContract(web3, abi, contractAddr)
+  let KeysStorage = attachToContract(web3, abi, contractAddr)
   console.log("attach to oracles contract");
-  if (!oraclesContract) {
+  if (!KeysStorage) {
     return cb();
   }
 
-  oraclesContract.methods.checkInitialKey(initialKey).call(function(isNew) {
+  KeysStorage.methods.checkInitialKey(initialKey).call(function(isNew) {
     cb(isNew);
   })
 }
\ No newline at end of file
diff --git a/assets/javascripts/application/createKeys.js b/assets/javascripts/application/createKeys.js
index 94cd874..0cd29b2 100755
--- a/assets/javascripts/application/createKeys.js
+++ b/assets/javascripts/application/createKeys.js
@@ -1,8 +1,8 @@
 function createKeys(web3, keys, contractAddr, abi, cb) {
   console.log("***Create keys function***");
-  let oraclesContract = attachToContract(web3, abi, contractAddr)
+  let KeysStorage = attachToContract(web3, abi, contractAddr)
   console.log("attach to oracles contract");
-  if (!oraclesContract) {
+  if (!KeysStorage) {
     return cb();
   }
 
@@ -11,7 +11,7 @@ function createKeys(web3, keys, contractAddr, abi, cb) {
   var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
   var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
   
-  oraclesContract.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address, 
+  KeysStorage.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address, 
     "0x" + keys.payoutKey.payoutKeyObject.address, 
     "0x" + keys.votingKey.votingKeyObject.address
   ).send(opts).on('error', error => {