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

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +8 -7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b363bc3e70 - Show all commits

11
cmd/lotus-provider/deps/deps.go
View File

@ -11,14 +11,18 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/BurntSushi/toml"
"github.com/gbrlsnchs/jwt/v3"
ds "github.com/ipfs/go-datastore" ds "github.com/ipfs/go-datastore"
dssync "github.com/ipfs/go-datastore/sync" dssync "github.com/ipfs/go-datastore/sync"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"github.com/urfave/cli/v2"
"golang.org/x/xerrors"
"github.com/BurntSushi/toml"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-jsonrpc/auth"
"github.com/filecoin-project/go-statestore" "github.com/filecoin-project/go-statestore"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
cliutil "github.com/filecoin-project/lotus/cli/util" cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/journal"
@ -34,9 +38,6 @@ import (
"github.com/filecoin-project/lotus/storage/sealer" "github.com/filecoin-project/lotus/storage/sealer"
"github.com/filecoin-project/lotus/storage/sealer/ffiwrapper" "github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sealer/storiface"
"github.com/gbrlsnchs/jwt/v3"
"github.com/urfave/cli/v2"
"golang.org/x/xerrors"
) )
var log = logging.Logger("lotus-provider/deps") var log = logging.Logger("lotus-provider/deps")
@ -164,7 +165,7 @@ func (deps *Deps) PopulateRemainingDeps(ctx context.Context, cctx *cli.Context,
if err != nil { if err != nil {
return err return err
} }
defer func() { go func() {
<-ctx.Done() <-ctx.Done()
_ = j.Close() _ = j.Close()
}() }()

2
cmd/lotus-provider/main.go
View File

@ -29,7 +29,7 @@ func SetupCloseHandler() {
go func() { go func() {
<-c <-c
fmt.Println("\r- Ctrl+C pressed in Terminal") fmt.Println("\r- Ctrl+C pressed in Terminal")
pprof.Lookup("goroutine").WriteTo(os.Stdout, 1) _ = pprof.Lookup("goroutine").WriteTo(os.Stdout, 1)
panic(1) panic(1)
}() }()
} }

2
cmd/lotus-provider/tasks/tasks.go
View File

@ -5,13 +5,13 @@ import (
"context" "context"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"github.com/samber/lo"
"github.com/filecoin-project/lotus/cmd/lotus-provider/deps" "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
"github.com/filecoin-project/lotus/lib/harmony/harmonytask" "github.com/filecoin-project/lotus/lib/harmony/harmonytask"
"github.com/filecoin-project/lotus/provider" "github.com/filecoin-project/lotus/provider"
"github.com/filecoin-project/lotus/provider/lpmessage" "github.com/filecoin-project/lotus/provider/lpmessage"
"github.com/filecoin-project/lotus/provider/lpwinning" "github.com/filecoin-project/lotus/provider/lpwinning"
"github.com/samber/lo"
) )
var log = logging.Logger("lotus-provider/deps") var log = logging.Logger("lotus-provider/deps")