Use numeric data types for gas prices, confirmation times, and block numbers

avislash · avislash · commit 384329f2261b · 2022-10-25T10:40:10.000-04:00
diff --git a/gas_tracker.go b/gas_tracker.go
@@ -7,11 +7,17 @@
 
 package etherscan
 
+import "time"
+
 // GasEstiamte gets estiamted confirmation time (in seconds) at the given gas price
-func (c *Client) GasEstimate(gasPrice int) (confirmationTimeInSec string, err error) {
+func (c *Client) GasEstimate(gasPrice int) (confirmationTimeInSec time.Duration, err error) {
 	params := M{"gasPrice": gasPrice}
-	err = c.call("gastracker", "gasestimate", params, &confirmationTimeInSec)
-	return
+	var confTime string
+	err = c.call("gastracker", "gasestimate", params, &confTime)
+	if err != nil {
+		return
+	}
+	return time.ParseDuration(confTime + "s")
 }
 
 // GasOracle gets suggested gas prices (in Gwei)
diff --git a/gas_tracker_e2e_test.go b/gas_tracker_e2e_test.go
@@ -13,41 +13,17 @@ import (
 
 //GasEstiamte generates dynamic data. Best we can do is ensure all fields are populated
 func TestClient_GasEstimate(t *testing.T) {
-	confirmationTime, err := api.GasEstimate(20000000)
+	_, err := api.GasEstimate(20000000)
 	noError(t, err, "api.GasEstimate")
-
-	if 0 == len(confirmationTime) {
-		t.Errorf("confirmationTime empty string")
-	}
 }
 
 //GasOracle generates dynamic data. Best we can do is ensure all fields are populated
 func TestClient_GasOracle(t *testing.T) {
 	gasPrice, err := api.GasOracle()
 	noError(t, err, "api.GasOrcale")
 
-	if 0 == len(gasPrice.LastBlock) {
-		t.Errorf("gasPrice.LastBlock empty string")
-	}
-
-	if 0 == len(gasPrice.SafeGasPrice) {
-		t.Errorf("gasPrice.SafeGasPrice empty string")
-	}
-
-	if 0 == len(gasPrice.ProposeGasPrice) {
-		t.Errorf("gasPrice.ProposeGasPrice empty string")
-	}
-
-	if 0 == len(gasPrice.FastGasPrice) {
-		t.Errorf("gasPrice.FastGasPrice empty string")
-	}
-
-	if 0 == len(gasPrice.SuggestBaseFeeInGwei) {
-		t.Errorf("gasPrice.SuggestBaseFeeInGwei empty string")
-	}
-
 	if 0 == len(gasPrice.GasUsedRatio) {
-		t.Errorf("gasPrice.GasUsedRatio empty string")
+		t.Errorf("gasPrice.GasUsedRatio empty")
 	}
 
 }
diff --git a/response.go b/response.go
@@ -7,7 +7,12 @@
 
 package etherscan
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+)
 
 // Envelope is the carrier of nearly every response
 type Envelope struct {
@@ -178,10 +183,62 @@ type Log struct {
 //GasPrices holds info for Gas Oracle queries
 //Gas Prices are returned in Gwei
 type GasPrices struct {
-	LastBlock            string
-	SafeGasPrice         string
-	ProposeGasPrice      string
-	FastGasPrice         string
-	SuggestBaseFeeInGwei string `json:"suggestBaseFee"`
-	GasUsedRatio         string `json:"gasUsedRatio"`
+	LastBlock            int
+	SafeGasPrice         float64
+	ProposeGasPrice      float64
+	FastGasPrice         float64
+	SuggestBaseFeeInGwei float64   `json:"suggestBaseFee"`
+	GasUsedRatio         []float64 `json:"gasUsedRatio"`
+}
+
+func (gp *GasPrices) UnmarshalJSON(data []byte) error {
+	_gp := struct {
+		LastBlock            string
+		SafeGasPrice         string
+		ProposeGasPrice      string
+		FastGasPrice         string
+		SuggestBaseFeeInGwei string `json:"suggestBaseFee"`
+		GasUsedRatio         string `json:"gasUsedRatio"`
+	}{}
+
+	err := json.Unmarshal(data, &_gp)
+	if err != nil {
+		return err
+	}
+
+	gp.LastBlock, err = strconv.Atoi(_gp.LastBlock)
+	if err != nil {
+		return fmt.Errorf("Unable to convert LastBlock %s to int: %w", _gp.LastBlock, err)
+	}
+
+	gp.SafeGasPrice, err = strconv.ParseFloat(_gp.SafeGasPrice, 64)
+	if err != nil {
+		return fmt.Errorf("Unable to convert SafeGasPrice %s to float64: %w", _gp.SafeGasPrice, err)
+	}
+
+	gp.ProposeGasPrice, err = strconv.ParseFloat(_gp.ProposeGasPrice, 64)
+	if err != nil {
+		return fmt.Errorf("Unable to convert ProposeGasPrice %s to float64: %w", _gp.ProposeGasPrice, err)
+	}
+
+	gp.FastGasPrice, err = strconv.ParseFloat(_gp.FastGasPrice, 64)
+	if err != nil {
+		return fmt.Errorf("Unable to convert FastGasPrice %s to float64: %w", _gp.FastGasPrice, err)
+	}
+
+	gp.SuggestBaseFeeInGwei, err = strconv.ParseFloat(_gp.SuggestBaseFeeInGwei, 64)
+	if err != nil {
+		return fmt.Errorf("Unable to convert SuggestBaseFeeInGwei %s to float64: %w", _gp.SuggestBaseFeeInGwei, err)
+	}
+
+	gasRatios := strings.Split(_gp.GasUsedRatio, ",")
+	gp.GasUsedRatio = make([]float64, len(gasRatios))
+	for i, gasRatio := range gasRatios {
+		gp.GasUsedRatio[i], err = strconv.ParseFloat(gasRatio, 64)
+		if err != nil {
+			return fmt.Errorf("Unable to convert gasRatio %s to float64: %w", gasRatio, err)
+		}
+	}
+
+	return nil
 }
