Merge pull request nanmu42#19 from nanmu42/develop

nanmu42 · web-flow · commit 586884d258b6 · 2019-10-14T10:14:33.000+08:00
add desc param to ERC20Transfers()
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 language: go
 
+env:
+  - GO111MODULE=on
+
 script:
-- go test -v -coverprofile=coverage.txt -covermode=count ./...
+  - go test -v -coverprofile=coverage.txt -covermode=count ./...
 
 after_success:
-- bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/account.go b/account.go
@@ -87,7 +87,7 @@ func (c *Client) InternalTxByAddress(address string, startBlock *int, endBlock *
 //
 // More information can be found at:
 // https://github.com/nanmu42/etherscan-api/issues/8
-func (c *Client) ERC20Transfers(contractAddress, address *string, startBlock *int, endBlock *int, page int, offset int) (txs []ERC20Transfer, err error) {
+func (c *Client) ERC20Transfers(contractAddress, address *string, startBlock *int, endBlock *int, page int, offset int, desc bool) (txs []ERC20Transfer, err error) {
 	param := M{
 		"page":   page,
 		"offset": offset,
@@ -97,6 +97,12 @@ func (c *Client) ERC20Transfers(contractAddress, address *string, startBlock *in
 	compose(param, "startblock", startBlock)
 	compose(param, "endblock", endBlock)
 
+	if desc {
+		param["sort"] = "desc"
+	} else {
+		param["sort"] = "asc"
+	}
+
 	err = c.call("account", "tokentx", param, &txs)
 	return
 }
diff --git a/account_e2e_test.go b/account_e2e_test.go
@@ -78,7 +78,7 @@ func TestClient_ERC20Transfers(t *testing.T) {
 
 	var a, b = 3273004, 3328071
 	var contract, address = "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a", "0x4e83362442b8d1bec281594cea3050c8eb01311c"
-	txs, err := api.ERC20Transfers(&contract, &address, &a, &b, 1, 500)
+	txs, err := api.ERC20Transfers(&contract, &address, &a, &b, 1, 500, false)
 	noError(t, err, "api.ERC20Transfers 1")
 
 	//j, _ := json.MarshalIndent(txs, "", "  ")
@@ -88,8 +88,15 @@ func TestClient_ERC20Transfers(t *testing.T) {
 		t.Errorf("got txs length %v, want %v", len(txs), wantLen1)
 	}
 
-	txs, err = api.ERC20Transfers(nil, &address, nil, &b, 1, 500)
-	noError(t, err, "api.ERC20Transfers 2")
+	txs, err = api.ERC20Transfers(nil, &address, nil, &b, 1, 500, false)
+	noError(t, err, "api.ERC20Transfers 2 asc")
+	if len(txs) != wantLen2 {
+		t.Errorf("got txs length %v, want %v", len(txs), wantLen2)
+	}
+
+	txs, err = api.ERC20Transfers(nil, &address, nil, &b, 1, 500, true)
+	noError(t, err, "api.ERC20Transfers 2 desc")
+
 	if len(txs) != wantLen2 {
 		t.Errorf("got txs length %v, want %v", len(txs), wantLen2)
 	}
@@ -99,7 +106,7 @@ func TestClient_ERC20Transfers(t *testing.T) {
 	var specialContract = "0x5eac95ad5b287cf44e058dcf694419333b796123"
 	var specialStartHeight = 6024142
 	var specialEndHeight = 6485274
-	txs, err = api.ERC20Transfers(&specialContract, nil, &specialStartHeight, &specialEndHeight, 1, 500)
+	txs, err = api.ERC20Transfers(&specialContract, nil, &specialStartHeight, &specialEndHeight, 1, 500, false)
 	noError(t, err, "api.ERC20Transfers 2")
 	if len(txs) != wantLen3 {
 		t.Errorf("got txs length %v, want %v", len(txs), wantLen3)
diff --git a/go.mod b/go.mod
@@ -0,0 +1,3 @@
+module github.com/nanmu42/etherscan-api
+
+go 1.13

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module github.com/nanmu42/etherscan-api`
	`2`	`+`
	`3`	`+go 1.13`