Merge pull request #114 from EbenezerGH/cleanup-stat-extra-fields

update remove stat extra fields

Author: EbenezerGH

etherscan-sample/src/main/java/jfyg/etherscan/helloetherescan/SampleActivity.kt

@@ -32,10 +32,10 @@ class SampleActivity : AppCompatActivity() {
         fab.setOnClickListener {
 
             //stat test
-            stat.getLastPriceInBtc()
+            stat.getEtherStatistics()
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribeBy(
-                            onSuccess = { Log.d(TAG, "The current price of Ether in Btc: $it") },
+                            onSuccess = { Log.d(TAG, "The current price of Ether in Btc: ${it.ethUsd}") },
                             onError = { Log.d(TAG, "error receiving stat") })
 
 

etherscanapi/src/main/java/jfyg/data/stat/Stats.kt

@@ -1,6 +1,7 @@
 package jfyg.data.stat
 
 import io.reactivex.Single
+import jfyg.data.StatPrice
 import jfyg.network.queries.ApiQuery
 import jfyg.utils.ETH_PRICE
 import jfyg.utils.ETH_SUPPLY
@@ -28,24 +29,9 @@ class Stats : StatsContract {
     override fun getTotalSupplyInWei(): Single<Double> = supplyQuery.map { it.result?.toDouble()?.div(wei) }
 
     /**
-     * Get ETHER LastPrice Price in btc
+     * Get Ether Statistics
      */
-    override fun getLastPriceInUsd(): Single<Float> = priceQuery.map { it.result?.ethUsd?.toFloat() }
-
-    /**
-     * Return timestamp
-     */
-    override fun getEthTimestamp(): Single<Long> = priceQuery.map { it.result?.ethUsdTimestamp?.toLong() }
-
-    /**
-     * Get ETHER LastPrice Price in usd
-     */
-    override fun getLastPriceInBtc(): Single<Float> = priceQuery.map { it.result?.ethBtcTimestamp?.toFloat() }
-
-    /**
-     * Return timestamp
-     */
-    override fun getBtcTimestamp(): Single<Long> = priceQuery.map { it.result?.ethBtcTimestamp?.toLong() }
+    override fun getEtherStatistics(): Single<StatPrice> = priceQuery.map { it.result }
 
     /**
      * Return network status

etherscanapi/src/main/java/jfyg/data/stat/StatsContract.kt

@@ -1,6 +1,7 @@
 package jfyg.data.stat
 
 import io.reactivex.Single
+import jfyg.data.StatPrice
 
 /**
  * https://etherscan.io/apis#stats
@@ -18,24 +19,9 @@ internal interface StatsContract {
     fun getTotalSupplyInWei(): Single<Double>
 
     /**
-     * Get ETHER LastPrice Price in btc
+     * Get ETHER statistics
      */
-    fun getLastPriceInBtc(): Single<Float>
-
-    /**
-     * Return timestamp
-     */
-    fun getBtcTimestamp(): Single<Long>
-
-    /**
-     * Get ETHER LastPrice Price in usd
-     */
-    fun getLastPriceInUsd(): Single<Float>
-
-    /**
-     * Return timestamp
-     */
-    fun getEthTimestamp(): Single<Long>
+    fun getEtherStatistics(): Single<StatPrice>
 
     /**
      * Return network status

etherscanapi/src/test/java/jfyg/data/stat/StatsTest.kt

@@ -61,33 +61,20 @@ internal class StatsTest {
     }
 
     @Test
-    fun getLastPriceInUsd() {
+    fun getEtherStatistics() {
         val response = gson.fromJson(inputPrice, StatPriceResponse::class.java)
         assertEquals("377.67", response.result?.ethUsd)
-    }
-
-    @Test
-    fun getEthTimestamp() {
-        val response = gson.fromJson(inputPrice, StatPriceResponse::class.java)
-        assertEquals("1523064526", response.result?.ethUsdTimestamp)
-    }
-
-    @Test
-    fun getLastPriceInBtc() {
-        val response = gson.fromJson(inputPrice, StatPriceResponse::class.java)
         assertEquals("0.0557", response.result?.ethBtc)
-    }
-
-    @Test
-    fun getBtcTimestamp() {
-        val response = gson.fromJson(inputPrice, StatPriceResponse::class.java)
+        assertEquals("1523064526", response.result?.ethUsdTimestamp)
         assertEquals("1523064523", response.result?.ethBtcTimestamp)
+
     }
 
     @Test
     fun networkStatusIsDown() {
         val response = gson.fromJson(inputBadResponse, BaseResponse::class.java)
         assertEquals("0", response.status)
+
     }
 
     @Test