change variable names

Author: Ebenezer Ackon

app/src/main/java/jfyg/etherscan/helloetherescan/MainActivity.kt

@@ -42,7 +42,7 @@ class MainActivity : AppCompatActivity() {
             //contracts test
             contract.getContractABI("0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413").observeOn(AndroidSchedulers.mainThread())
                     ?.subscribeBy {
-                        Log.d(TAG, "The EBI has returned: $it")
+                        Log.d(TAG, "The ABI has returned: $it")
                     }
 
             //transaction test

etherscanapi/src/main/java/jfyg/account/Account.kt

@@ -18,36 +18,36 @@ class Account : AccountContract {
 
     private val queryUtil = QueryUtils()
 
-    override fun getBalance(account: String?): Single<Double> =
+    override fun getBalance(address: String?): Single<Double> =
             query.accountBalance("account",
                     "balance",
-                    account,
+                    address,
                     "latest").map { it.result?.toDouble() }
 
-    override fun getMultiBalance(accounts: ArrayList<String>?): Single<ArrayList<Balances>> =
+    override fun getMultiBalance(addresses: ArrayList<String>?): Single<ArrayList<Balances>> =
             query.accountMultiBalance("account",
                     "balancemulti",
-                    queryUtil.retrieveAccounts(accounts),
+                    queryUtil.retrieveAccounts(addresses),
                     "latest").map { it.result }
 
-    override fun getBlocks(account: String?): Single<ArrayList<Blocks>> =
+    override fun getBlocks(address: String?): Single<ArrayList<Blocks>> =
             query.accountBlock("account",
                     "getminedblocks",
-                    account,
+                    address,
                     "blocks").map { it.result }
 
-    override fun getTransactions(account: String?): Single<ArrayList<Transactions>> =
+    override fun getTransactions(address: String?): Single<ArrayList<Transactions>> =
             query.accountTransactions("account",
                     "txlist",
-                    account,
+                    address,
                     "0",
                     "99999999",
                     "asc").map { it.result }
 
-    override fun getInternalTransactions(account: String?): Single<ArrayList<TransactionsInternal>> =
+    override fun getInternalTransactions(address: String?): Single<ArrayList<TransactionsInternal>> =
             query.accountInternalTransactions("account",
                     "txlistinternal",
-                    account,
+                    address,
                     "0",
                     "99999999",
                     "asc").map { it.result }

etherscanapi/src/main/java/jfyg/account/AccountContract.kt

@@ -21,26 +21,26 @@ internal interface AccountContract {
     /**
      * Return account balance
      */
-    fun getBalance(account: String?): Single<Double>
+    fun getBalance(address: String?): Single<Double>
 
     /**
      * Return balances of multiple accounts separated by commas
      */
-    fun getMultiBalance(accounts: ArrayList<String>?): Single<ArrayList<Balances>>
+    fun getMultiBalance(addresses: ArrayList<String>?): Single<ArrayList<Balances>>
 
     /**
      * Get list of blocks mined by address
      */
-    fun getBlocks(account: String?): Single<ArrayList<Blocks>>
+    fun getBlocks(address: String?): Single<ArrayList<Blocks>>
 
     /**
      * Get a list of 'Normal' Transactions By Address
      */
-    fun getTransactions(account: String?): Single<ArrayList<Transactions>>
+    fun getTransactions(address: String?): Single<ArrayList<Transactions>>
 
     /**
      * Get a list of 'Internal' Transactions by Address
      */
-    fun getInternalTransactions(account: String?): Single<ArrayList<TransactionsInternal>>
+    fun getInternalTransactions(address: String?): Single<ArrayList<TransactionsInternal>>
 
 }

etherscanapi/src/main/java/jfyg/contract/SmartContract.kt

@@ -9,9 +9,9 @@ class SmartContract : SmartContractContract {
             "getabi",
             "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413")
 
-    override fun getContractABI(account: String?): Single<String> = query.abiContract("contract",
+    override fun getContractABI(address: String?): Single<String> = query.abiContract("contract",
             "getabi",
-            account).map { it.result }
+            address).map { it.result }
 
     override fun getNetworkStatus(): Single<String> = abiQuery.map { it.status }
 

etherscanapi/src/main/java/jfyg/contract/SmartContractContract.kt

@@ -8,7 +8,7 @@ internal interface SmartContractContract {
     /**
      * Return contract ABI for Verified Contract Source Code
      */
-    fun getContractABI(account: String?): Single<String>
+    fun getContractABI(address: String?): Single<String>
 
     /**
      * Return network status