From 8fe8977758ce25d463dac2799bb53b789b719bdc Mon Sep 17 00:00:00 2001 From: "Andrew Jackson (Ajax)" Date: Tue, 14 Nov 2023 19:53:00 -0600 Subject: [PATCH] fixes --- cmd/lotus-provider/proving.go | 8 +++--- cmd/lotus-provider/run.go | 2 +- go.sum | 1 - node/builder_chain.go | 1 - provider/lpwindow/compute_task_test.go | 35 -------------------------- 5 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 provider/lpwindow/compute_task_test.go diff --git a/cmd/lotus-provider/proving.go b/cmd/lotus-provider/proving.go index 3c3bbf0ab..42e023dc5 100644 --- a/cmd/lotus-provider/proving.go +++ b/cmd/lotus-provider/proving.go @@ -7,11 +7,13 @@ import ( "fmt" "os" - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/dline" - "github.com/filecoin-project/lotus/provider" "github.com/urfave/cli/v2" "golang.org/x/xerrors" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/dline" + + "github.com/filecoin-project/lotus/provider" ) var provingCmd = &cli.Command{ diff --git a/cmd/lotus-provider/run.go b/cmd/lotus-provider/run.go index 7b065e6d9..ffb2f5b5f 100644 --- a/cmd/lotus-provider/run.go +++ b/cmd/lotus-provider/run.go @@ -329,7 +329,7 @@ func getDeps(cctx *cli.Context, ctx context.Context) (*Deps, error) { sa, err := StorageAuth(cfg.Apis.StorageRPCSecret) if err != nil { - return xerrors.Errorf(`'%w' while parsing the config toml's + return nil, xerrors.Errorf(`'%w' while parsing the config toml's [Apis] StorageRPCSecret=%v Get it with: jq .PrivateKey ~/.lotus-miner/keystore/MF2XI2BNNJ3XILLQOJUXMYLUMU`, err, cfg.Apis.StorageRPCSecret) diff --git a/go.sum b/go.sum index aee413de4..fff879092 100644 --- a/go.sum +++ b/go.sum @@ -344,7 +344,6 @@ github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= -github.com/filecoin-project/go-state-types v0.11.1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= github.com/filecoin-project/go-state-types v0.11.2-0.20230712101859-8f37624fa540/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= github.com/filecoin-project/go-state-types v0.12.5 h1:VQ2N2T3JeUDdIHEo/xhjnT7Q218Wl0UYIyglqT7Z9Ck= github.com/filecoin-project/go-state-types v0.12.5/go.mod h1:iJTqGdWDvzXhuVf64Lw0hzt4TIoitMo0VgHdxdjNDZI= diff --git a/node/builder_chain.go b/node/builder_chain.go index 267659f00..f101cbe18 100644 --- a/node/builder_chain.go +++ b/node/builder_chain.go @@ -60,7 +60,6 @@ var ChainNode = Options( Override(new(dtypes.NetworkName), modules.NetworkName), Override(new(modules.Genesis), modules.ErrorGenesis), Override(new(dtypes.AfterGenesisSet), modules.SetGenesis), - Override(SetGenesisKey, modules.DoSetGenesis), Override(new(beacon.Schedule), modules.RandomSchedule), // Network bootstrap diff --git a/provider/lpwindow/compute_task_test.go b/provider/lpwindow/compute_task_test.go deleted file mode 100644 index f1b3e04ed..000000000 --- a/provider/lpwindow/compute_task_test.go +++ /dev/null @@ -1,35 +0,0 @@ -package lpwindow_test - -import ( - "testing" - - "github.com/stretchr/testify/require" - - "github.com/filecoin-project/go-state-types/dline" - - "github.com/filecoin-project/lotus/chain/types" - "github.com/filecoin-project/lotus/lib/harmony/harmonydb" - "github.com/filecoin-project/lotus/lib/harmony/harmonytask" - "github.com/filecoin-project/lotus/node/config" - "github.com/filecoin-project/lotus/provider/lpwindow" -) - -// test to create WDPostTask, invoke AddTask and check if the task is added to the DB -func TestAddTask(t *testing.T) { - db, err := harmonydb.NewFromConfig(config.HarmonyDB{ - Hosts: []string{"localhost"}, - Port: "5433", - Username: "yugabyte", - Password: "yugabyte", - Database: "yugabyte", - }) - require.NoError(t, err) - wdPostTask, err := lpwindow.NewWdPostTask(db, nil, 0) - require.NoError(t, err) - taskEngine, err := harmonytask.New(db, []harmonytask.TaskInterface{wdPostTask}, "localhost:12300") - _ = taskEngine - ts := types.TipSet{} - deadline := dline.Info{} - - require.NoError(t, err) -}