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

fix: remove unused onComplete callback

Browse Source
This commit is contained in:
Dirk McCormick 2020-08-07 12:31:43 -04:00
parent 70f93da5dd
commit e488996fd0
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
paychmgr/simple.go
View File

@ -98,7 +98,7 @@ func (ca *channelAccessor) processNextQueueItem() {
} }
head := ca.fundsReqQueue[0] head := ca.fundsReqQueue[0]
res := ca.processTask(head.ctx, head.from, head.to, head.amt, head.onComplete) res := ca.processTask(head.ctx, head.from, head.to, head.amt)
// If the task is waiting on an external event (eg something to appear on // If the task is waiting on an external event (eg something to appear on
// chain) it will return nil // chain) it will return nil
@ -123,7 +123,7 @@ func (ca *channelAccessor) processNextQueueItem() {
// 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(mcid cid.Cid, err error, cb onCompleteFn) { func (ca *channelAccessor) msgWaitComplete(mcid cid.Cid, err error) {
ca.lk.Lock() ca.lk.Lock()
defer ca.lk.Unlock() defer ca.lk.Unlock()
@ -133,9 +133,6 @@ func (ca *channelAccessor) msgWaitComplete(mcid cid.Cid, err error, cb onComplet
log.Errorf("saving message result: %s", dserr) log.Errorf("saving message result: %s", dserr)
} }
// Call the onComplete callback
ca.callOnComplete(mcid, err, cb)
// Inform listeners that the message has completed // Inform listeners that the message has completed
ca.msgListeners.fireMsgComplete(mcid, err) ca.msgListeners.fireMsgComplete(mcid, err)
@ -182,7 +179,6 @@ func (ca *channelAccessor) processTask(
from address.Address, from address.Address,
to address.Address, to address.Address,
amt types.BigInt, amt types.BigInt,
onComplete onCompleteFn,
) *paychFundsRes { ) *paychFundsRes {
// Get the payment channel for the from/to addresses. // Get the payment channel for the from/to addresses.
// Note: It's ok if we get ErrChannelNotTracked. It just means we need to // Note: It's ok if we get ErrChannelNotTracked. It just means we need to
@ -194,7 +190,7 @@ func (ca *channelAccessor) processTask(
// If a channel has not yet been created, create one. // If a channel has not yet been created, create one.
if channelInfo == nil { if channelInfo == nil {
mcid, err := ca.createPaych(ctx, from, to, amt, onComplete) mcid, err := ca.createPaych(ctx, from, to, amt)
if err != nil { if err != nil {
return &paychFundsRes{err: err} return &paychFundsRes{err: err}
} }
@ -218,7 +214,7 @@ func (ca *channelAccessor) processTask(
// We need to add more funds, so send an add funds message to // We need to add more funds, so send an add funds message to
// cover the amount for this request // cover the amount for this request
mcid, err := ca.addFunds(ctx, channelInfo, amt, onComplete) mcid, err := ca.addFunds(ctx, channelInfo, amt)
if err != nil { if err != nil {
return &paychFundsRes{err: err} return &paychFundsRes{err: err}
} }
@ -226,7 +222,7 @@ func (ca *channelAccessor) processTask(
} }
// createPaych sends a message to create the channel and returns the message cid // createPaych sends a message to create the channel and returns the message cid
func (ca *channelAccessor) createPaych(ctx context.Context, from, to address.Address, amt types.BigInt, cb onCompleteFn) (cid.Cid, error) { func (ca *channelAccessor) createPaych(ctx context.Context, from, to address.Address, amt types.BigInt) (cid.Cid, error) {
params, aerr := actors.SerializeParams(&paych.ConstructorParams{From: from, To: to}) params, aerr := actors.SerializeParams(&paych.ConstructorParams{From: from, To: to})
if aerr != nil { if aerr != nil {
return cid.Undef, aerr return cid.Undef, aerr
@ -262,16 +258,16 @@ func (ca *channelAccessor) createPaych(ctx context.Context, from, to address.Add
} }
// Wait for the channel to be created on chain // Wait for the channel to be created on chain
go ca.waitForPaychCreateMsg(ci.ChannelID, mcid, cb) go ca.waitForPaychCreateMsg(ci.ChannelID, mcid)
return mcid, nil return mcid, nil
} }
// waitForPaychCreateMsg waits for mcid to appear on chain and stores the robust address of the // waitForPaychCreateMsg waits for mcid to appear on chain and stores the robust address of the
// created payment channel // created payment channel
func (ca *channelAccessor) waitForPaychCreateMsg(channelID string, mcid cid.Cid, cb onCompleteFn) { func (ca *channelAccessor) waitForPaychCreateMsg(channelID string, mcid cid.Cid) {
err := ca.waitPaychCreateMsg(channelID, mcid) err := ca.waitPaychCreateMsg(channelID, mcid)
ca.msgWaitComplete(mcid, err, cb) ca.msgWaitComplete(mcid, err)
} }
func (ca *channelAccessor) waitPaychCreateMsg(channelID string, mcid cid.Cid) error { func (ca *channelAccessor) waitPaychCreateMsg(channelID string, mcid cid.Cid) error {
@ -319,7 +315,7 @@ func (ca *channelAccessor) waitPaychCreateMsg(channelID string, mcid cid.Cid) er
} }
// addFunds sends a message to add funds to the channel and returns the message cid // addFunds sends a message to add funds to the channel and returns the message cid
func (ca *channelAccessor) addFunds(ctx context.Context, channelInfo *ChannelInfo, amt types.BigInt, cb onCompleteFn) (*cid.Cid, error) { func (ca *channelAccessor) addFunds(ctx context.Context, channelInfo *ChannelInfo, amt types.BigInt) (*cid.Cid, error) {
msg := &types.Message{ msg := &types.Message{
To: *channelInfo.Channel, To: *channelInfo.Channel,
From: channelInfo.Control, From: channelInfo.Control,
@ -346,15 +342,15 @@ func (ca *channelAccessor) addFunds(ctx context.Context, channelInfo *ChannelInf
log.Errorf("saving add funds message CID %s: %s", mcid, err) log.Errorf("saving add funds message CID %s: %s", mcid, err)
} }
go ca.waitForAddFundsMsg(channelInfo.ChannelID, mcid, cb) go ca.waitForAddFundsMsg(channelInfo.ChannelID, mcid)
return &mcid, nil return &mcid, nil
} }
// waitForAddFundsMsg waits for mcid to appear on chain and returns error, if any // waitForAddFundsMsg waits for mcid to appear on chain and returns error, if any
func (ca *channelAccessor) waitForAddFundsMsg(channelID string, mcid cid.Cid, cb onCompleteFn) { func (ca *channelAccessor) waitForAddFundsMsg(channelID string, mcid cid.Cid) {
err := ca.waitAddFundsMsg(channelID, mcid) err := ca.waitAddFundsMsg(channelID, mcid)
ca.msgWaitComplete(mcid, err, cb) ca.msgWaitComplete(mcid, err)
} }
func (ca *channelAccessor) waitAddFundsMsg(channelID string, mcid cid.Cid) error { func (ca *channelAccessor) waitAddFundsMsg(channelID string, mcid cid.Cid) error {
@ -434,7 +430,7 @@ func (pm *Manager) restartPending() error {
if err != nil { if err != nil {
return xerrors.Errorf("error initializing payment channel manager %s -> %s: %s", ci.Control, ci.Target, err) return xerrors.Errorf("error initializing payment channel manager %s -> %s: %s", ci.Control, ci.Target, err)
} }
go ca.waitForPaychCreateMsg(ci.ChannelID, *ci.CreateMsg, nil) go ca.waitForPaychCreateMsg(ci.ChannelID, *ci.CreateMsg)
return nil return nil
}) })
} else if ci.AddFundsMsg != nil { } else if ci.AddFundsMsg != nil {
@ -443,7 +439,7 @@ func (pm *Manager) restartPending() error {
if err != nil { if err != nil {
return xerrors.Errorf("error initializing payment channel manager %s: %s", ci.Channel, err) return xerrors.Errorf("error initializing payment channel manager %s: %s", ci.Channel, err)
} }
go ca.waitForAddFundsMsg(ci.ChannelID, *ci.AddFundsMsg, nil) go ca.waitForAddFundsMsg(ci.ChannelID, *ci.AddFundsMsg)
return nil return nil
}) })
} }