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

Merge branch 'filecoin-project:master' into master

Browse Source
This commit is contained in:
kaola526 2022-06-10 00:37:37 +08:00 committed by GitHub
commit 9e27c49168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/client_retr.go
View File

@ -145,7 +145,7 @@ func retrieve(ctx context.Context, cctx *cli.Context, fapi lapi.FullNode, sel *l
} }
if offer.MinPrice.GreaterThan(big.Int(maxPrice)) { if offer.MinPrice.GreaterThan(big.Int(maxPrice)) {
return nil, xerrors.Errorf("failed to find offer satisfying maxPrice: %s", maxPrice) return nil, xerrors.Errorf("failed to find offer satisfying maxPrice: %s. Try increasing maxPrice", maxPrice)
} }
o := offer.Order(payer) o := offer.Order(payer)

1
paychmgr/manager.go
View File

@ -87,6 +87,7 @@ func newManager(pchstore *Store, pchapi managerAPI) (*Manager, error) {
channels: make(map[string]*channelAccessor), channels: make(map[string]*channelAccessor),
pchapi: pchapi, pchapi: pchapi,
} }
pm.ctx, pm.shutdown = context.WithCancel(context.Background())
return pm, pm.Start() return pm, pm.Start()
} }

10
paychmgr/mock_test.go
View File

@ -136,7 +136,7 @@ func newMockPaychAPI() *mockPaychAPI {
func (pchapi *mockPaychAPI) StateWaitMsg(ctx context.Context, mcid cid.Cid, confidence uint64, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error) { func (pchapi *mockPaychAPI) StateWaitMsg(ctx context.Context, mcid cid.Cid, confidence uint64, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error) {
pchapi.lk.Lock() pchapi.lk.Lock()
response := make(chan types.MessageReceipt) response := make(chan types.MessageReceipt, 1)
if response, ok := pchapi.waitingResponses[mcid]; ok { if response, ok := pchapi.waitingResponses[mcid]; ok {
defer pchapi.lk.Unlock() defer pchapi.lk.Unlock()
@ -151,8 +151,12 @@ func (pchapi *mockPaychAPI) StateWaitMsg(ctx context.Context, mcid cid.Cid, conf
pchapi.waitingCalls[mcid] = &waitingCall{response: response} pchapi.waitingCalls[mcid] = &waitingCall{response: response}
pchapi.lk.Unlock() pchapi.lk.Unlock()
receipt := <-response select {
return &api.MsgLookup{Receipt: receipt}, nil case receipt := <-response:
return &api.MsgLookup{Receipt: receipt}, nil
case <-ctx.Done():
return nil, ctx.Err()
}
} }
func (pchapi *mockPaychAPI) receiveMsgResponse(mcid cid.Cid, receipt types.MessageReceipt) { func (pchapi *mockPaychAPI) receiveMsgResponse(mcid cid.Cid, receipt types.MessageReceipt) {

2
paychmgr/paychget_test.go
View File

@ -631,7 +631,7 @@ func TestPaychGetRestartAfterAddFundsMsg(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// Simulate shutting down system // Simulate shutting down system
mock.close() require.NoError(t, mgr.Stop())
// Create a new manager with the same datastore // Create a new manager with the same datastore
mock2 := newMockManagerAPI() mock2 := newMockManagerAPI()

6
paychmgr/simple.go
View File

@ -3,6 +3,7 @@ package paychmgr
import ( import (
"bytes" "bytes"
"context" "context"
"errors"
"fmt" "fmt"
"sort" "sort"
"sync" "sync"
@ -351,6 +352,11 @@ func (ca *channelAccessor) queueSize() int {
// msgWaitComplete is called when the message for a previous task is confirmed // msgWaitComplete is called when the message for a previous task is confirmed
// or there is an error. // or there is an error.
func (ca *channelAccessor) msgWaitComplete(ctx context.Context, mcid cid.Cid, err error) { func (ca *channelAccessor) msgWaitComplete(ctx context.Context, mcid cid.Cid, err error) {
// if context is canceled, should Not mark message to 'bad', just return.
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return
}
ca.lk.Lock() ca.lk.Lock()
defer ca.lk.Unlock() defer ca.lk.Unlock()