OSDN Git Service

Merge pull request #680 from Bytom/fix-print-json-invalid-type-assertion
authorPaladz <yzhu101@uottawa.ca>
Tue, 17 Apr 2018 09:34:45 +0000 (17:34 +0800)
committerGitHub <noreply@github.com>
Tue, 17 Apr 2018 09:34:45 +0000 (17:34 +0800)
fix print json invalid type assertion

1  2 
api/accounts.go
api/query.go
wallet/indexer.go

diff --cc 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,
diff --cc api/query.go
Simple merge
Simple merge