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

Jump to bottom

fix: command help string #194

Merged
merged 2 commits into from
Sep 5, 2022
Merged

fix: command help string #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
494ddb4
fix: command help string
zl03jsj Sep 5, 2022
c99373d
Merge branch 'master' into fix/cmd-help-string
zl03jsj Sep 5, 2022
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
6 changes: 3 additions & 3 deletions cmd/market-client/client_retr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,13 @@ In case of CAR retrieval, the selector must have one common "sub-root" node.
Examples:

- Retrieve a file by CID
$ lotus client retrieve Qm... my-file.txt
# market-client retrieval retrieve --maxPrice 0.1fil bafyk... my-file

- Retrieve a file by CID from f0123
$ lotus client retrieve --provider f0123 Qm... my-file.txt
# market-client retrieval retrieve --maxPrice 0.1fil --miner f0123 bafyk... my-file

- Retrieve a first file from a specified directory
$ lotus client retrieve --data-selector /Links/0/Hash Qm... my-file.txt
$ market-client retrieval retrieve --data-selector /Links/0/Hash bafyk... my-file.txt
`,
Flags: append([]cli.Flag{
&cli.BoolFlag{
Expand Down
8 changes: 4 additions & 4 deletions cmd/market-client/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,11 @@ var storageDealsInitCmd = &cli.Command{
Name: "init",
Usage: "Initialize storage deal with a miner",
Description: `Make a deal with a miner.
dataCid comes from running 'lotus client import'.
dataCid comes from running 'market-client data import'.
miner is the address of the miner you wish to make a deal with.
price is measured in FIL/Epoch. Miners usually don't accept a bid
lower than their advertised ask (which is in FIL/GiB/Epoch). You can check a miners listed price
with 'lotus client query-ask <miner address>'.
with './market-client storage asks query <miner address>'.
duration is how long the miner should store the data for, in blocks.
The minimum value is 518400 (6 months).`,
ArgsUsage: "[dataCid miner price duration]",
Expand Down Expand Up @@ -665,7 +665,7 @@ uiLoop:

switch state {
case "import":
afmt.Print("Data CID (from " + color.YellowString("lotus client import") + "): ")
afmt.Print("Data CID (from " + color.YellowString("market-client data import") + "): ")

_cidStr, _, err := rl.ReadLine()
cidStr := string(_cidStr)
Expand Down Expand Up @@ -1443,7 +1443,7 @@ func renderDeal(di *client.DealInfo) {
color.Blue("Proposal CID: %s\n\n", di.ProposalCid.String())

if di.DealStages == nil {
color.Yellow("Deal was made with an older version of Lotus and Lotus did not collect detailed information about its stages")
color.Yellow("Deal was made with an older version of venus-market and venus-market did not collect detailed information about its stages")
return
}

Expand Down
2 changes: 1 addition & 1 deletion network/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func Security(enabled, preferTLS bool) interface{} {
if !enabled {
return func() (opts Libp2pOpts) {
// TODO: shouldn't this be Errorf to guarantee visibility?
log.Warnf(`Your lotus node has been configured to run WITHOUT ENCRYPTED CONNECTIONS.
log.Warnf(`Your full node has been configured to run WITHOUT ENCRYPTED CONNECTIONS.
You will not be able to connect to any nodes configured to use encrypted connections`)
opts.Opts = append(opts.Opts, libp2p.NoSecurity)
return opts
Expand Down