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

override maddr on lotus-storage-miner info as well

Browse Source
This commit is contained in:
Anton Evangelatov 2020-07-03 19:35:20 +02:00
parent 2a050ca326
commit 978ab67c73
3 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/lotus-storage-miner/info.go
View File

@ -44,7 +44,7 @@ var infoCmd = &cli.Command{
ctx := lcli.ReqContext(cctx) ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx) maddr, err := getActorAddress(ctx, nodeApi, cctx.String("maddr"))
if err != nil { if err != nil {
return err return err
} }

20
cmd/lotus-storage-miner/main.go
View File

@ -1,12 +1,16 @@
package main package main
import ( import (
"context"
"os" "os"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"go.opencensus.io/trace" "go.opencensus.io/trace"
"golang.org/x/xerrors"
"github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/lib/lotuslog" "github.com/filecoin-project/lotus/lib/lotuslog"
@ -89,3 +93,19 @@ func main() {
os.Exit(1) os.Exit(1)
} }
} }
func getActorAddress(ctx context.Context, nodeApi api.StorageMiner, overrideMaddr string) (maddr address.Address, err error) {
if overrideMaddr != "" {
maddr, err = address.NewFromString(overrideMaddr)
if err != nil {
return maddr, err
}
}
maddr, err = nodeApi.ActorAddress(ctx)
if err != nil {
return maddr, xerrors.Errorf("getting actor address: %w", err)
}
return maddr, nil
}

40
cmd/lotus-storage-miner/proving.go
View File

@ -10,7 +10,6 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-bitfield"
rlepluslazy "github.com/filecoin-project/go-bitfield/rle" rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
@ -49,18 +48,9 @@ var provingFaultsCmd = &cli.Command{
ctx := lcli.ReqContext(cctx) ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx) maddr, err := getActorAddress(ctx, nodeApi, cctx.String("maddr"))
if err != nil { if err != nil {
return xerrors.Errorf("getting actor address: %w", err) return err
}
// override maddr is specified
if cctx.String("maddr") != "" {
var err error
maddr, err = address.NewFromString(cctx.String("maddr"))
if err != nil {
panic(err)
}
} }
var mas miner.State var mas miner.State
@ -126,18 +116,9 @@ var provingInfoCmd = &cli.Command{
ctx := lcli.ReqContext(cctx) ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx) maddr, err := getActorAddress(ctx, nodeApi, cctx.String("maddr"))
if err != nil { if err != nil {
return xerrors.Errorf("getting actor address: %w", err) return err
}
// override maddr is specified
if cctx.String("maddr") != "" {
var err error
maddr, err = address.NewFromString(cctx.String("maddr"))
if err != nil {
panic(err)
}
} }
head, err := api.ChainHead(ctx) head, err := api.ChainHead(ctx)
@ -258,18 +239,9 @@ var provingDeadlinesCmd = &cli.Command{
ctx := lcli.ReqContext(cctx) ctx := lcli.ReqContext(cctx)
maddr, err := nodeApi.ActorAddress(ctx) maddr, err := getActorAddress(ctx, nodeApi, cctx.String("maddr"))
if err != nil { if err != nil {
return xerrors.Errorf("getting actor address: %w", err) return err
}
// override maddr is specified
if cctx.String("maddr") != "" {
var err error
maddr, err = address.NewFromString(cctx.String("maddr"))
if err != nil {
panic(err)
}
} }
deadlines, err := api.StateMinerDeadlines(ctx, maddr, types.EmptyTSK) deadlines, err := api.StateMinerDeadlines(ctx, maddr, types.EmptyTSK)