Refactor totalTokens to usedTokens in API

boookmarks · May 27, 2019 · 6ec0175 · 6ec0175
1 parent 42d3ecd
commit 6ec0175
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/api/types.go b/api/types.go
@@ -248,7 +248,7 @@ type Address struct {
 	Transactions          []*Tx                 `json:"transactions,omitempty"`
 	Txids                 []string              `json:"txids,omitempty"`
 	Nonce                 string                `json:"nonce,omitempty"`
-	TotalTokens           int                   `json:"totalTokens,omitempty"`
+	UsedTokens            int                   `json:"usedTokens,omitempty"`
 	Tokens                []Token               `json:"tokens,omitempty"`
 	Erc20Contract         *bchain.Erc20Contract `json:"erc20Contract,omitempty"`
 	// helpers for explorer

diff --git a/api/xpub.go b/api/xpub.go
@@ -505,7 +505,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
 	} else {
 		txCount = int(data.txCountEstimate)
 	}
-	totalTokens := 0
+	usedTokens := 0
 	var tokens []Token
 	var xpubAddresses map[string]struct{}
 	if option > AccountDetailsBasic {
@@ -516,7 +516,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
 		for i := range da {
 			ad := &da[i]
 			if ad.balance != nil {
-				totalTokens++
+				usedTokens++
 			}
 			if option > AccountDetailsBasic {
 				token := w.tokenFromXpubAddress(data, ad, ci, i, option)
@@ -542,7 +542,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
 		UnconfirmedTxs:        unconfirmedTxs,
 		Transactions:          txs,
 		Txids:                 txids,
-		TotalTokens:           totalTokens,
+		UsedTokens:            usedTokens,
 		Tokens:                tokens,
 		XPubAddresses:         xpubAddresses,
 	}

diff --git a/docs/api.md b/docs/api.md
@@ -366,7 +366,7 @@ Response:
     "57833d50969208091bd6c950599a1b5cf9d66d992ae8a8d3560fb943b98ebb23",
     "9cfd6295f20e74ddca6dd816c8eb71a91e4da70fe396aca6f8ce09dc2947839f",
   ],
-  "totalTokens": 2,
+  "usedTokens": 2,
   "tokens": [
     {
       "type": "XPUBAddress",
@@ -392,7 +392,7 @@ Response:
 }
 ```
 
-Note: *totalTokens* always returns total number of **used** addresses of xpub.
+Note: *usedTokens* always returns total number of **used** addresses of xpub.
 
 #### Get utxo