cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #3123 from filecoin-project/fix/retrieval-nil-serializing

Browse Source 
Fix/retrieval nil serializing
This commit is contained in:
Łukasz Magiera 2020-08-18 02:20:12 +02:00 committed by GitHub
commit dfa2ac6807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli/client.go
View File

@ -854,15 +854,15 @@ var clientRetrieveCmd = &cli.Command{
for { for {
select { select {
case evt, chOpen := <-updates: case evt, ok := <-updates:
fmt.Printf("> Recv: %s, Paid %s, %s (%s)\n", if ok {
types.SizeStr(types.NewInt(evt.BytesReceived)), fmt.Printf("> Recv: %s, Paid %s, %s (%s)\n",
types.FIL(evt.FundsSpent), types.SizeStr(types.NewInt(evt.BytesReceived)),
retrievalmarket.ClientEvents[evt.Event], types.FIL(evt.FundsSpent),
retrievalmarket.DealStatuses[evt.Status], retrievalmarket.ClientEvents[evt.Event],
) retrievalmarket.DealStatuses[evt.Status],
)
if !chOpen { } else {
fmt.Println("Success") fmt.Println("Success")
return nil return nil
} }

5
node/impl/client/client.go
View File

@ -6,6 +6,7 @@ import (
"io" "io"
"os" "os"
"github.com/filecoin-project/specs-actors/actors/abi/big"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/ipfs/go-blockservice" "github.com/ipfs/go-blockservice"
@ -409,11 +410,9 @@ func (a *API) clientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
defer close(events) defer close(events)
finish := func(e error) { finish := func(e error) {
errStr := ""
if e != nil { if e != nil {
errStr = e.Error() events <- marketevents.RetrievalEvent{Err: e.Error(), FundsSpent: big.Zero()}
} }
events <- marketevents.RetrievalEvent{Err: errStr}
} }
if order.MinerPeer.ID == "" { if order.MinerPeer.ID == "" {