refactor: cleanup code

nanmu42 · nanmu42 · commit 4ee35b2ec340 · 2021-10-15T14:31:30.000+08:00
diff --git a/block.go b/block.go
@@ -7,7 +7,10 @@
 
 package etherscan
 
-import "strconv"
+import (
+	"fmt"
+	"strconv"
+)
 
 // BlockReward gets block and uncle rewards by block number
 func (c *Client) BlockReward(blockNum int) (rewards BlockRewards, err error) {
@@ -19,21 +22,28 @@ func (c *Client) BlockReward(blockNum int) (rewards BlockRewards, err error) {
 	return
 }
 
-// BlockNumber gets closest block number by UNIX timestamp
+// BlockNumber gets the closest block number by UNIX timestamp
+//
+// valid closest option: before, after
 func (c *Client) BlockNumber(timestamp int64, closest string) (blockNumber int, err error) {
-	var result string
+	var blockNumberStr string
+
 	param := M{
-		"timestamp": strconv.Itoa(int(timestamp)),
+		"timestamp": strconv.FormatInt(timestamp, 10),
 		"closest":   closest,
 	}
 
-	err = c.call("block", "getblocknobytime", param, &result)
+	err = c.call("block", "getblocknobytime", param, &blockNumberStr)
+
+	if err != nil {
+		return
+	}
 
+	blockNumber, err = strconv.Atoi(blockNumberStr)
 	if err != nil {
+		err = fmt.Errorf("parsing block number %q: %w", blockNumberStr, err)
 		return
 	}
 
-	blockNum, err := strconv.ParseInt(result, 10, 64)
-	blockNumber = int(blockNum)
 	return
 }
diff --git a/block_e2e_test.go b/block_e2e_test.go
@@ -26,21 +26,21 @@ func TestClient_BlockReward(t *testing.T) {
 }
 
 func TestClient_BlockNumber(t *testing.T) {
-	//Note: All values taken from docs.etherscan.io/api-endpoints/blocks
-	const ans_before = 9251482
-	const ans_after = 9251483
+	// Note: All values taken from docs.etherscan.io/api-endpoints/blocks
+	const ansBefore = 9251482
+	const ansAfter = 9251483
 
 	blockNumber, err := api.BlockNumber(1578638524, "before")
 	noError(t, err, "api.BlockNumber")
 
-	if blockNumber != ans_before {
-		t.Errorf(`api.BlockNumber(1578638524, "before") not working, got %d, want %d`, blockNumber, ans_before)
+	if blockNumber != ansBefore {
+		t.Errorf(`api.BlockNumber(1578638524, "before") not working, got %d, want %d`, blockNumber, ansBefore)
 	}
 
 	blockNumber, err = api.BlockNumber(1578638524, "after")
 	noError(t, err, "api.BlockNumber")
 
-	if blockNumber != ans_after {
-		t.Errorf(`api.BlockNumber(1578638524,"after") not working, got %d, want %d`, blockNumber, ans_after)
+	if blockNumber != ansAfter {
+		t.Errorf(`api.BlockNumber(1578638524,"after") not working, got %d, want %d`, blockNumber, ansAfter)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -26,21 +26,21 @@ func TestClient_BlockReward(t *testing.T) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func TestClient_BlockNumber(t *testing.T) {`
`29`		`- //Note: All values taken from docs.etherscan.io/api-endpoints/blocks`
`30`		`- const ans_before = 9251482`
`31`		`- const ans_after = 9251483`
	`29`	`+ // Note: All values taken from docs.etherscan.io/api-endpoints/blocks`
	`30`	`+ const ansBefore = 9251482`
	`31`	`+ const ansAfter = 9251483`
`32`	`32`
`33`	`33`	`blockNumber, err := api.BlockNumber(1578638524, "before")`
`34`	`34`	`noError(t, err, "api.BlockNumber")`
`35`	`35`
`36`		`- if blockNumber != ans_before {`
`37`		- t.Errorf(`api.BlockNumber(1578638524, "before") not working, got %d, want %d`, blockNumber, ans_before)
	`36`	`+ if blockNumber != ansBefore {`
	`37`	+ t.Errorf(`api.BlockNumber(1578638524, "before") not working, got %d, want %d`, blockNumber, ansBefore)
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`blockNumber, err = api.BlockNumber(1578638524, "after")`
`41`	`41`	`noError(t, err, "api.BlockNumber")`
`42`	`42`
`43`		`- if blockNumber != ans_after {`
`44`		- t.Errorf(`api.BlockNumber(1578638524,"after") not working, got %d, want %d`, blockNumber, ans_after)
	`43`	`+ if blockNumber != ansAfter {`
	`44`	+ t.Errorf(`api.BlockNumber(1578638524,"after") not working, got %d, want %d`, blockNumber, ansAfter)
`45`	`45`	`}`
`46`	`46`	`}`