fix example test

Author: godaddy-x

examples/api_node_test.go

@@ -0,0 +1,66 @@
+package performance_test
+
+import (
+	"fmt"
+	"github.com/blocktree/go-openw-sdk/v2/openwsdk"
+	"github.com/blocktree/openwallet/v2/log"
+	"github.com/blocktree/openwallet/v2/owtp"
+	"strings"
+	"testing"
+)
+
+const (
+	sslkey = "FXJXCtxAfHWhAvnpsnciEfVCkThn7NGMA1kBofYRECRe"
+	host   = "127.0.0.1:8422"
+	appid  = "e10adc3949ba59abbe56e057f20f883e"
+	appkey = "8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92"
+)
+
+var api *openwsdk.APINode
+
+func init() {
+	api = testNewAPINode()
+}
+
+func testNewAPINode() *openwsdk.APINode {
+	cert, _ := owtp.NewCertificate(sslkey)
+	config := &openwsdk.APINodeConfig{
+		AppID:              appid,
+		AppKey:             appkey,
+		Host:               host,
+		Cert:               cert,
+		ConnectType:        owtp.HTTP,
+		EnableSignature:    false,
+		EnableKeyAgreement: false,
+		TimeoutSEC:         120,
+	}
+	api := openwsdk.NewAPINode(config)
+	api.BindAppDevice()
+	return api
+}
+
+// 获取节点配置信息
+func TestAPINode_GetNotifierNodeInfo(t *testing.T) {
+	pubKey, nodeId, err := api.GetNotifierNodeInfo()
+	if err != nil {
+		t.Logf("GetNotifierNodeInfo unexpected error: %v", err)
+		return
+	}
+
+	log.Infof("pubKey: %s", pubKey)
+	log.Infof("nodeID: %s", nodeId)
+}
+
+// 获取币种列表,包含推荐费率和区块高度
+func TestAPINode_GetSymbolList(t *testing.T) {
+	api := testNewAPINode()
+	api.GetSymbolList("QTUM", 0, 1000, 0, true, func(status uint64, msg string, total int, symbols []*openwsdk.Symbol) {
+		symbolStrArray := make([]string, 0)
+		for _, s := range symbols {
+			fmt.Printf("symbol: %+v\n", s)
+			symbolStrArray = append(symbolStrArray, s.Symbol)
+		}
+		allSymbols := strings.Join(symbolStrArray, ", ")
+		log.Infof("all symbols: %s", allSymbols)
+	})
+}

openwsdk/api_node.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/blocktree/openwallet/v2/common"
-	"github.com/blocktree/openwallet/v2/crypto"
 	"github.com/blocktree/openwallet/v2/hdkeystore"
 	"github.com/blocktree/openwallet/v2/log"
 	"github.com/blocktree/openwallet/v2/openwallet"
@@ -264,22 +263,12 @@ func (api *APINode) GetSymbolList(symbol string, offset, limit, hasRole int, syn
 		"hasRole": hasRole,
 	}
 
-	return api.node.Call(HostNodeID, "getSymbolList", params, sync, func(resp owtp.Response) {
-		data := resp.JsonData()
-		symbols := make([]*Symbol, 0)
-		symbolArray := data.Get("symbols")
-		total := data.Get("total").Int()
-		if symbolArray.IsArray() {
-			for _, s := range symbolArray.Array() {
-				var sym Symbol
-				err := json.Unmarshal([]byte(s.Raw), &sym)
-				if err == nil {
-					symbols = append(symbols, &sym)
-				}
-			}
+	return api.node.Call(HostNodeID, "getSymbolBlockList", params, sync, func(resp owtp.Response) {
+		var result []*Symbol
+		if err := json.Unmarshal([]byte(resp.JsonData().Raw), &result); err != nil {
+			log.Error("json unmarshal failed: ", err)
 		}
-
-		reqFunc(resp.Status, resp.Msg, int(total), symbols)
+		reqFunc(resp.Status, resp.Msg, 0, nil)
 	})
 }
 
@@ -1102,30 +1091,6 @@ func (api *APINode) ImportAccount(
 	})
 }
 
-// BindDevice 绑定设备ID
-func (api *APINode) BindDevice(
-	deviceID string,
-	sync bool,
-	reqFunc func(status uint64, msg string)) error {
-	if api == nil {
-		return fmt.Errorf("APINode is not inited")
-	}
-	appID := api.config.AppID
-	appKey := api.config.AppKey
-	accessTime := time.Now().UnixNano() / 1e6
-	t := strconv.FormatInt(accessTime, 10)
-	sigStr := appID + "." + deviceID + "." + t + "." + appKey
-	params := map[string]interface{}{
-		"appID":      appID,
-		"deviceID":   deviceID,
-		"accessTime": accessTime,
-		"sign":       crypto.GetMD5(sigStr),
-	}
-	return api.node.Call(HostNodeID, "bindAppDevice", params, sync, func(resp owtp.Response) {
-		reqFunc(resp.Status, resp.Msg)
-	})
-}
-
 // ImportBatchAddress 批量导入地址
 func (api *APINode) ImportBatchAddress(
 	walletID, accountID, memo string,
@@ -1183,11 +1148,13 @@ func (api *APINode) GetNotifierNodeInfo() (string, string, error) {
 	)
 	appID := api.config.AppID
 	time := time.Now().UnixNano()
-	plainText := fmt.Sprintf("%s%d%s", appID, time, api.config.AppKey)
-	sign := crypto.GetMD5(plainText)
+	nonce := RandNonce()
+	plainText := fmt.Sprintf("%s%s%d", appID, nonce, time)
+	sign := HmacSHA256([]byte(plainText), []byte(api.config.AppKey))
 
 	params := map[string]interface{}{
 		"appID": appID,
+		"nonce": nonce,
 		"time":  time,
 		"sign":  sign,
 	}
@@ -1201,7 +1168,7 @@ func (api *APINode) GetNotifierNodeInfo() (string, string, error) {
 
 		data := resp.JsonData()
 		pubKey = data.Get("pubKey").String()
-		nodeId = data.Get("nodeId").String()
+		nodeId = data.Get("nodeID").String()
 	})
 	if err != nil {
 		return "", "", err

openwsdk/model_test.go

@@ -40,7 +40,7 @@ func TestWallet_CreateAccount(t *testing.T) {
 	wallet.RootPath = key.RootPath
 
 	symbol := &Symbol{}
-	symbol.Coin = "BTC"
+	symbol.Symbol = "BTC"
 	symbol.Curve = int64(owcrypt.ECC_CURVE_SECP256K1)
 
 	account, err := wallet.CreateAccount("newacc", symbol, key)

openwsdk/models.go

@@ -110,9 +110,10 @@ type Wallet struct {
 
 type Symbol struct {
 	Name         string `json:"name" bson:"name" storm:"id"`
-	Coin         string `json:"coin" bson:"coin"`
+	MainSymbol   string `json:"mainSymbol" bson:"mainSymbol"`
+	Symbol       string `json:"symbol" bson:"symbol"`
 	Curve        int64  `json:"curve" bson:"curve"`
-	Orderno      int64  `json:"orderno" bson:"orderno"`
+	OrderNo      int64  `json:"orderNo" bson:"orderNo"`
 	Confirm      int64  `json:"confirm" bson:"confirm"`
 	Decimals     int64  `json:"decimals" bson:"decimals"`
 	BalanceMode  uint64 `json:"balanceMode" bson:"balanceMode"`
@@ -121,6 +122,9 @@ type Symbol struct {
 	OnlyContract uint64 `json:"onlyContract"` //支持合约代币, 0: false, 1: true
 	WithdrawStop int64  `json:"withdrawStop"`
 	BlockStop    int64  `json:"blockStop"`
+	MaxHeight    int64  `json:"maxHeight"`
+	FeeRate      string `json:"feeRate"`
+	Unit         string `json:"unit"`
 }
 
 type Account struct {
@@ -363,7 +367,7 @@ func (wallet *Wallet) CreateAccount(alias string, symbol *Symbol, key *hdkeystor
 	)
 
 	account.Alias = alias
-	account.Symbol = symbol.Coin
+	account.Symbol = symbol.Symbol
 	account.ReqSigs = 1
 
 	newAccIndex := wallet.AccountIndex + 1