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

merge

Browse Source
This commit is contained in:
Sami Mäkelä 2020-08-12 14:15:03 +03:00
parent ac6e716ebd
commit 5169785c91
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,11 +194,7 @@ var setAskCmd = &cli.Command{
defer closer() defer closer()
pri := types.NewInt(cctx.Uint64("price")) pri := types.NewInt(cctx.Uint64("price"))
<<<<<<< HEAD
verifiedPri := types.NewInt(cctx.Uint64("verified-price"))
=======
vpri := types.NewInt(cctx.Uint64("verified-price")) vpri := types.NewInt(cctx.Uint64("verified-price"))
>>>>>>> e2c6cc6c6deb4620cbf3b05fb7600b8743d15564
dur, err := time.ParseDuration(cctx.String("duration")) dur, err := time.ParseDuration(cctx.String("duration"))
if err != nil { if err != nil {
@ -241,11 +237,7 @@ var setAskCmd = &cli.Command{
return xerrors.Errorf("max piece size (w/bit-padding) %s cannot exceed miner sector size %s", types.SizeStr(types.NewInt(uint64(max))), types.SizeStr(types.NewInt(uint64(smax)))) return xerrors.Errorf("max piece size (w/bit-padding) %s cannot exceed miner sector size %s", types.SizeStr(types.NewInt(uint64(max))), types.SizeStr(types.NewInt(uint64(smax))))
} }
<<<<<<< HEAD
return api.MarketSetAsk(ctx, pri, verifiedPri, abi.ChainEpoch(qty), abi.PaddedPieceSize(min), abi.PaddedPieceSize(max))
=======
return api.MarketSetAsk(ctx, pri, vpri, abi.ChainEpoch(qty), abi.PaddedPieceSize(min), abi.PaddedPieceSize(max)) return api.MarketSetAsk(ctx, pri, vpri, abi.ChainEpoch(qty), abi.PaddedPieceSize(min), abi.PaddedPieceSize(max))
>>>>>>> e2c6cc6c6deb4620cbf3b05fb7600b8743d15564
}, },
} }