Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix, null pointer exception in data-transfer-handler #136

Merged
merged 1 commit into from
Jun 6, 2022
Merged

fix, null pointer exception in data-transfer-handler #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions retrievalprovider/datatransfer_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,15 @@ func NewDataTransferHandler(retrievalDealHandler IRetrievalHandler, retrievalDea
func (d *DataTransferHandler) HandleCompleteFor(ctx context.Context, identifier rm.ProviderDealIdentifier) error {
deal, err := d.retrievalDealStore.GetDeal(ctx, identifier.Receiver, identifier.DealID)
if err != nil {
deal.Status = rm.DealStatusErrored
return d.retrievalDealStore.SaveDeal(ctx, deal)
return err
}
return d.retrievalDealHandler.CleanupDeal(context.TODO(), deal)
}

func (d *DataTransferHandler) HandleAcceptFor(ctx context.Context, identifier rm.ProviderDealIdentifier, channelId datatransfer.ChannelID) error {
deal, err := d.retrievalDealStore.GetDeal(ctx, identifier.Receiver, identifier.DealID)
if err != nil {
deal.Status = rm.DealStatusErrored
return d.retrievalDealStore.SaveDeal(ctx, deal)
return err
}
deal.ChannelID = &channelId
return d.retrievalDealHandler.UnsealData(ctx, deal)
Expand All @@ -52,18 +50,15 @@ func (d *DataTransferHandler) HandleAcceptFor(ctx context.Context, identifier rm
func (d *DataTransferHandler) HandleDisconnectFor(ctx context.Context, identifier rm.ProviderDealIdentifier, errIn error) error {
deal, err := d.retrievalDealStore.GetDeal(ctx, identifier.Receiver, identifier.DealID)
if err != nil {
deal.Status = rm.DealStatusErrored
deal.Message = err.Error()
return d.retrievalDealStore.SaveDeal(ctx, deal)
return err
}
return d.retrievalDealHandler.Error(ctx, deal, errIn)
}

func (d *DataTransferHandler) HandleCancelForDeal(ctx context.Context, identifier rm.ProviderDealIdentifier) error {
deal, err := d.retrievalDealStore.GetDeal(ctx, identifier.Receiver, identifier.DealID)
if err != nil {
deal.Status = rm.DealStatusErrored
return d.retrievalDealStore.SaveDeal(ctx, deal)
return err
}
switch deal.Status {
case rm.DealStatusFailing:
Expand All @@ -79,9 +74,7 @@ func (d *DataTransferHandler) HandleCancelForDeal(ctx context.Context, identifie
func (d *DataTransferHandler) HandleErrorForDeal(ctx context.Context, identifier rm.ProviderDealIdentifier, errIn error) error {
deal, err := d.retrievalDealStore.GetDeal(ctx, identifier.Receiver, identifier.DealID)
if err != nil {
deal.Status = rm.DealStatusErrored
deal.Message = err.Error()
return d.retrievalDealStore.SaveDeal(ctx, deal)
return err
}
return d.retrievalDealHandler.Error(ctx, deal, errIn)
}