Clean up, minor optimization

mrz1836 · Jan 17, 2020 · dc7ba09 · dc7ba09
1 parent 038ad89
commit dc7ba09
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/blocks.go b/blocks.go
@@ -13,13 +13,11 @@ func (c *Client) GetBlockByHash(hash string) (blockInfo *BlockInfo, err error) {
 
 	var resp string
 	// https://api.whatsonchain.com/v1/bsv/<network>/block/hash/<hash>
-	url := fmt.Sprintf("%s%s/block/hash/%s", apiEndpoint, c.Parameters.Network, hash)
-	if resp, err = c.Request(url, http.MethodGet, nil); err != nil {
+	if resp, err = c.Request(fmt.Sprintf("%s%s/block/hash/%s", apiEndpoint, c.Parameters.Network, hash), http.MethodGet, nil); err != nil {
 		return
 	}
 
-	blockInfo = new(BlockInfo)
-	err = json.Unmarshal([]byte(resp), blockInfo)
+	err = json.Unmarshal([]byte(resp), &blockInfo)
 	return
 }
 
@@ -30,13 +28,11 @@ func (c *Client) GetBlockByHeight(height int64) (blockInfo *BlockInfo, err error
 
 	var resp string
 	// https://api.whatsonchain.com/v1/bsv/<network>/block/height/<height>
-	url := fmt.Sprintf("%s%s/block/height/%d", apiEndpoint, c.Parameters.Network, height)
-	if resp, err = c.Request(url, http.MethodGet, nil); err != nil {
+	if resp, err = c.Request(fmt.Sprintf("%s%s/block/height/%d", apiEndpoint, c.Parameters.Network, height), http.MethodGet, nil); err != nil {
 		return
 	}
 
-	blockInfo = new(BlockInfo)
-	err = json.Unmarshal([]byte(resp), blockInfo)
+	err = json.Unmarshal([]byte(resp), &blockInfo)
 	return
 }
 
@@ -48,12 +44,10 @@ func (c *Client) GetBlockPages(hash string, page int) (txList *BlockPagesInfo, e
 
 	var resp string
 	// https://api.whatsonchain.com/v1/bsv/<network>/block/hash/<hash>/page/1
-	url := fmt.Sprintf("%s%s/block/hash/%s/page/%d", apiEndpoint, c.Parameters.Network, hash, page)
-	if resp, err = c.Request(url, http.MethodGet, nil); err != nil {
+	if resp, err = c.Request(fmt.Sprintf("%s%s/block/hash/%s/page/%d", apiEndpoint, c.Parameters.Network, hash, page), http.MethodGet, nil); err != nil {
 		return
 	}
 
-	txList = new(BlockPagesInfo)
-	err = json.Unmarshal([]byte(resp), txList)
+	err = json.Unmarshal([]byte(resp), &txList)
 	return
 }
diff --git a/chain_info.go b/chain_info.go
@@ -13,12 +13,10 @@ func (c *Client) GetChainInfo() (chainInfo *ChainInfo, err error) {
 
 	var resp string
 	// https://api.whatsonchain.com/v1/bsv/<network>/chain/info
-	url := fmt.Sprintf("%s%s/chain/info", apiEndpoint, c.Parameters.Network)
-	if resp, err = c.Request(url, http.MethodGet, nil); err != nil {
+	if resp, err = c.Request(fmt.Sprintf("%s%s/chain/info", apiEndpoint, c.Parameters.Network), http.MethodGet, nil); err != nil {
 		return
 	}
 
-	chainInfo = new(ChainInfo)
-	err = json.Unmarshal([]byte(resp), chainInfo)
+	err = json.Unmarshal([]byte(resp), &chainInfo)
 	return
 }
diff --git a/definitions.go b/definitions.go
@@ -32,6 +32,9 @@ type ChainInfo struct {
 	VerificationProgress float64 `json:"verificationprogress"`
 }
 
+// CirculatingSupply is the structure response
+type CirculatingSupply float64
+
 // BlockInfo is the response info about a returned block
 type BlockInfo struct {
 	Bits              string         `json:"bits"`

diff --git a/health.go b/health.go
@@ -11,6 +11,5 @@ import (
 func (c *Client) GetHealth() (status string, err error) {
 
 	// https://api.whatsonchain.com/v1/bsv/<network>/woc
-	url := fmt.Sprintf("%s%s/woc", apiEndpoint, c.Parameters.Network)
-	return c.Request(url, http.MethodGet, nil)
+	return c.Request(fmt.Sprintf("%s%s/woc", apiEndpoint, c.Parameters.Network), http.MethodGet, nil)
 }