fix tokenExec.Query_GetAccountTokenAssets

plugin/dapp/token/executor/token.go

@@ -108,11 +108,11 @@ func (t *token) getAccountTokenAssets(req *tokenty.ReqAccountTokenAssets) (types
 			return nil, err
 		}
 		var acc1 *types.Account
-		if req.Execer != "" {
-			execaddress := address.ExecAddress(req.Execer)
-			acc1 = acc.LoadExecAccount(req.Address, execaddress)
-		} else if req.Execer == t.GetName() {
+		if req.Execer == t.GetName() {
 			acc1 = acc.LoadAccount(req.Address)
+		} else if req.Execer != "" {
+			execAddress := address.ExecAddress(req.Execer)
+			acc1 = acc.LoadExecAccount(req.Address, execAddress)
 		}
 		if acc1 == nil {
 			continue

plugin/dapp/token/executor/token_test.go

@@ -152,6 +152,9 @@ func TestToken(t *testing.T) {
 	set, err := exec.ExecLocal(createTx, receiptDate, int(1))
 	assert.Nil(t, err)
 	assert.NotNil(t, set)
+	for _, kv := range set.KV {
+		kvdb.Set(kv.Key, kv.Value)
+	}
 
 	p2 := &pty.TokenFinishCreate{
 		Symbol: Symbol,
@@ -176,13 +179,16 @@ func TestToken(t *testing.T) {
 		stateDB.Set(kv.Key, kv.Value)
 	}
 	accDB, _ := account.NewAccountDB(pty.TokenX, Symbol, stateDB)
-	accChcek := accDB.LoadAccount(string(Nodes[0]))
-	assert.Equal(t, tokenTotal, accChcek.Balance)
+	accCheck := accDB.LoadAccount(string(Nodes[0]))
+	assert.Equal(t, tokenTotal, accCheck.Balance)
 
 	receiptDate = &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
 	set, err = exec.ExecLocal(createTx2, receiptDate, int(1))
 	assert.Nil(t, err)
 	assert.NotNil(t, set)
+	for _, kv := range set.KV {
+		kvdb.Set(kv.Key, kv.Value)
+	}
 
 	// mint burn
 	p3 := &pty.TokenMint{
@@ -208,13 +214,16 @@ func TestToken(t *testing.T) {
 		stateDB.Set(kv.Key, kv.Value)
 	}
 
-	accChcek = accDB.LoadAccount(string(Nodes[0]))
-	assert.Equal(t, tokenTotal+tokenMint, accChcek.Balance)
+	accCheck = accDB.LoadAccount(string(Nodes[0]))
+	assert.Equal(t, tokenTotal+tokenMint, accCheck.Balance)
 
 	receiptDate = &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
 	set, err = exec.ExecLocal(createTx3, receiptDate, int(1))
 	assert.Nil(t, err)
 	assert.NotNil(t, set)
+	for _, kv := range set.KV {
+		kvdb.Set(kv.Key, kv.Value)
+	}
 
 	p4 := &pty.TokenBurn{
 		Symbol: Symbol,
@@ -238,13 +247,31 @@ func TestToken(t *testing.T) {
 	for _, kv := range receipt.KV {
 		stateDB.Set(kv.Key, kv.Value)
 	}
-	accChcek = accDB.LoadAccount(string(Nodes[0]))
-	assert.Equal(t, tokenTotal+tokenMint-tokenBurn, accChcek.Balance)
+	accCheck = accDB.LoadAccount(string(Nodes[0]))
+	assert.Equal(t, tokenTotal+tokenMint-tokenBurn, accCheck.Balance)
 
 	receiptDate = &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
 	set, err = exec.ExecLocal(createTx4, receiptDate, int(1))
 	assert.Nil(t, err)
 	assert.NotNil(t, set)
+	for _, kv := range set.KV {
+		kvdb.Set(kv.Key, kv.Value)
+	}
+
+	tokenExec, ok := exec.(*token)
+	assert.True(t, ok)
+
+	in := pty.ReqAccountTokenAssets{
+		Address:              string(Nodes[0]),
+		Execer:               pty.TokenX,
+	}
+	out, err := tokenExec.Query_GetAccountTokenAssets(&in)
+	assert.Nil(t, err)
+	reply := out.(*pty.ReplyAccountTokenAssets)
+	assert.Equal(t, 1, len(reply.TokenAssets))
+	assert.NotEqual(t, 0, reply.TokenAssets[0].Account.Balance)
+	assert.Equal(t, string(Nodes[0]), reply.TokenAssets[0].Account.Addr)
+	t.Log(reply.TokenAssets)
 }
 
 func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {