From: Paladz Date: Tue, 17 Apr 2018 09:34:45 +0000 (+0800) Subject: Merge pull request #680 from Bytom/fix-print-json-invalid-type-assertion X-Git-Tag: v1.0.5-alpha~307 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5710138f1046c66af693c46f0a36343604390d46;p=bytom%2Fbytom-spv.git Merge pull request #680 from Bytom/fix-print-json-invalid-type-assertion fix print json invalid type assertion --- 5710138f1046c66af693c46f0a36343604390d46 diff --cc api/accounts.go index 7644c649,67bcaa9b..2d0d2173 --- a/api/accounts.go +++ b/api/accounts.go @@@ -111,10 -103,15 +111,10 @@@ func (a *API) listAddresses(ctx context return NewErrorResponse(err) } - var addresses []*addressResp + addresses := []*addressResp{} for _, cp := range cps { - if cp.Address == "" || (len(accountID) != 0 && strings.Compare(accountID, cp.AccountID) != 0) { - continue - } - - accountAlias := a.wallet.AccountMgr.GetAliasByID(cp.AccountID) addresses = append(addresses, &addressResp{ - AccountAlias: accountAlias, + AccountAlias: target.Alias, AccountID: cp.AccountID, Address: cp.Address, Change: cp.Change,