Removed blocknumber struct wrapping since it really isn't necessary

Author: avislash

block.go

@@ -19,8 +19,8 @@ func (c *Client) BlockReward(blockNum int) (rewards BlockRewards, err error) {
 	return
 }
 
-// BlockReward gets closest block number by UNIX timestamp
-func (c *Client) BlockNumber(timestamp int64, closest string) (blockNumber BlockNumberFromTimestamp, err error) {
+// BlockNumber gets closest block number by UNIX timestamp
+func (c *Client) BlockNumber(timestamp int64, closest string) (blockNumber int, err error) {
 	var result string
 	param := M{
 		"timestamp": strconv.Itoa(int(timestamp)),
@@ -34,6 +34,6 @@ func (c *Client) BlockNumber(timestamp int64, closest string) (blockNumber Block
 	}
 
 	blockNum, err := strconv.ParseInt(result, 10, 64)
-	blockNumber.BlockNumber = int(blockNum)
+	blockNumber = int(blockNum)
 	return
 }

block_e2e_test.go

@@ -33,14 +33,14 @@ func TestClient_BlockNumber(t *testing.T) {
 	blockNumber, err := api.BlockNumber(1578638524, "before")
 	noError(t, err, "api.BlockNumber")
 
-	if blockNumber.BlockNumber != ans_before {
-		t.Errorf(`api.BlockNumber(1578638524, "before") not working, got %d, want %d`, blockNumber.BlockNumber, ans_before)
+	if blockNumber != ans_before {
+		t.Errorf(`api.BlockNumber(1578638524, "before") not working, got %d, want %d`, blockNumber, ans_before)
 	}
 
 	blockNumber, err = api.BlockNumber(1578638524, "after")
 	noError(t, err, "api.BlockNumber")
 
-	if blockNumber.BlockNumber != ans_after {
-		t.Errorf(`api.BlockNumber(1578638524,"after") not working, got %d, want %d`, blockNumber.BlockNumber, ans_after)
+	if blockNumber != ans_after {
+		t.Errorf(`api.BlockNumber(1578638524,"after") not working, got %d, want %d`, blockNumber, ans_after)
 	}
 }

response.go

@@ -129,11 +129,6 @@ type BlockRewards struct {
 	UncleInclusionReward *BigInt `json:"uncleInclusionReward"`
 }
 
-// BlockNumberFromTimestamp holds info from query for block by UNIX timestamp
-type BlockNumberFromTimestamp struct {
-	BlockNumber int
-}
-
 // LatestPrice holds info from query for latest ether price
 type LatestPrice struct {
 	ETHBTC          float64 `json:"ethbtc,string"`