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

address review; flush tablewriter

Browse Source
This commit is contained in:
Łukasz Magiera 2021-02-05 22:26:37 +01:00
parent a4ddf9225f
commit 3ff6a6f59f
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/api_storage.go
View File

@ -243,7 +243,7 @@ type AddressConfig struct {
// PendingDealInfo has info about pending deals and when they are due to be // PendingDealInfo has info about pending deals and when they are due to be
// published // published
type PendingDealInfo struct { type PendingDealInfo struct {
Deals []*market.ClientDealProposal Deals []market.ClientDealProposal
PublishPeriodStart time.Time PublishPeriodStart time.Time
PublishPeriod time.Duration PublishPeriod time.Duration
} }

6
api/apistruct/struct.go
View File

@ -299,9 +299,9 @@ type StorageMinerStruct struct {
MarketGetRetrievalAsk func(ctx context.Context) (*retrievalmarket.Ask, error) `perm:"read"` MarketGetRetrievalAsk func(ctx context.Context) (*retrievalmarket.Ask, error) `perm:"read"`
MarketListDataTransfers func(ctx context.Context) ([]api.DataTransferChannel, error) `perm:"write"` MarketListDataTransfers func(ctx context.Context) ([]api.DataTransferChannel, error) `perm:"write"`
MarketDataTransferUpdates func(ctx context.Context) (<-chan api.DataTransferChannel, error) `perm:"write"` MarketDataTransferUpdates func(ctx context.Context) (<-chan api.DataTransferChannel, error) `perm:"write"`
MarketRestartDataTransfer func(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error `perm:"read"` MarketRestartDataTransfer func(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error `perm:"write"`
MarketCancelDataTransfer func(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error `perm:"read"` MarketCancelDataTransfer func(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error `perm:"write"`
MarketPendingDeals func(ctx context.Context) (api.PendingDealInfo, error) `perm:"admin"` MarketPendingDeals func(ctx context.Context) (api.PendingDealInfo, error) `perm:"write"`
MarketPublishPendingDeals func(ctx context.Context) error `perm:"admin"` MarketPublishPendingDeals func(ctx context.Context) error `perm:"admin"`
PledgeSector func(context.Context) error `perm:"write"` PledgeSector func(context.Context) error `perm:"write"`

4
cmd/lotus-storage-miner/market.go
View File

@ -862,7 +862,7 @@ var dealsPendingPublish = &cli.Command{
_, _ = fmt.Fprintf(w, "ProposalCID\tClient\tSize\n") _, _ = fmt.Fprintf(w, "ProposalCID\tClient\tSize\n")
for _, deal := range pending.Deals { for _, deal := range pending.Deals {
proposalNd, err := cborutil.AsIpld(deal) proposalNd, err := cborutil.AsIpld(&deal) // nolint
if err != nil { if err != nil {
return err return err
} }
@ -870,6 +870,6 @@ var dealsPendingPublish = &cli.Command{
_, _ = fmt.Fprintf(w, "%s\t%s\t%s\n", proposalNd.Cid(), deal.Proposal.Client, units.BytesSize(float64(deal.Proposal.PieceSize))) _, _ = fmt.Fprintf(w, "%s\t%s\t%s\n", proposalNd.Cid(), deal.Proposal.Client, units.BytesSize(float64(deal.Proposal.PieceSize)))
} }
return nil return w.Flush()
}, },
} }

6
documentation/en/api-methods-miner.md
View File

@ -529,7 +529,7 @@ Response: `{}`
MarketCancelDataTransfer cancels a data transfer with the given transfer ID and other peer MarketCancelDataTransfer cancels a data transfer with the given transfer ID and other peer
Perms: read Perms: write
Inputs: Inputs:
```json ```json
@ -730,7 +730,7 @@ Response: `null`
### MarketPendingDeals ### MarketPendingDeals
There are not yet any comments for this method. There are not yet any comments for this method.
Perms: admin Perms: write
Inputs: `null` Inputs: `null`
@ -756,7 +756,7 @@ Response: `{}`
MarketRestartDataTransfer attempts to restart a data transfer with the given transfer ID and other peer MarketRestartDataTransfer attempts to restart a data transfer with the given transfer ID and other peer
Perms: read Perms: write
Inputs: Inputs:
```json ```json

4
markets/storageadapter/dealpublisher.go
View File

@ -134,9 +134,9 @@ func (p *DealPublisher) PendingDeals() api.PendingDealInfo {
} }
} }
pending := make([]*market2.ClientDealProposal, len(deals)) pending := make([]market2.ClientDealProposal, len(deals))
for i, deal := range deals { for i, deal := range deals {
pending[i] = &deal.deal pending[i] = deal.deal
} }
return api.PendingDealInfo{ return api.PendingDealInfo{