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

resolve addresses to IDs for checks

Browse Source
This commit is contained in:
Jeromy 2020-04-17 14:23:30 -07:00
parent 24b7661837
commit 073962a60d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/test/deals.go
View File

@ -107,7 +107,7 @@ loop:
case storagemarket.StorageDealFailing: case storagemarket.StorageDealFailing:
t.Fatal("deal failed") t.Fatal("deal failed")
case storagemarket.StorageDealError: case storagemarket.StorageDealError:
t.Fatal("deal errored") t.Fatal("deal errored", di.Message)
case storagemarket.StorageDealActive: case storagemarket.StorageDealActive:
fmt.Println("COMPLETE", di) fmt.Println("COMPLETE", di)
break loop break loop

7
markets/storageadapter/client.go
View File

@ -177,7 +177,12 @@ func (c *ClientNodeAdapter) ValidatePublishedDeal(ctx context.Context, deal stor
return 0, xerrors.Errorf("getting miner worker failed: %w", err) return 0, xerrors.Errorf("getting miner worker failed: %w", err)
} }
if pubmsg.From != mi.Worker { fromid, err := c.StateLookupID(ctx, pubmsg.From, types.EmptyTSK)
if err != nil {
return 0, xerrors.Errorf("failed to resolve from msg ID addr: %w", err)
}
if fromid != mi.Worker {
return 0, xerrors.Errorf("deal wasn't published by storage provider: from=%s, provider=%s", pubmsg.From, deal.Proposal.Provider) return 0, xerrors.Errorf("deal wasn't published by storage provider: from=%s, provider=%s", pubmsg.From, deal.Proposal.Provider)
} }