From 84987f41c5ab7f135fa9a3a934baabd8afa2a740 Mon Sep 17 00:00:00 2001 From: huangzhiran Date: Mon, 14 Oct 2024 13:37:41 +0800 Subject: [PATCH] query api test fix --- cmd/apinode/persistence/postgres.go | 2 +- cmd/prover/db/db.go | 2 +- cmd/sequencer/config/config.go | 1 + task/assigner/assigner.go | 5 ----- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/apinode/persistence/postgres.go b/cmd/apinode/persistence/postgres.go index 689cc6c8..e31e8c62 100644 --- a/cmd/apinode/persistence/postgres.go +++ b/cmd/apinode/persistence/postgres.go @@ -172,7 +172,7 @@ func (p *Persistence) UpsertSettledTask(projectID uint64, taskID common.Hash) er } err := p.db.Clauses(clause.OnConflict{ Columns: []clause.Column{{Name: "task_id"}, {Name: "project_id"}}, - DoUpdates: clause.AssignmentColumns([]string{}), + DoNothing: true, }).Create(&t).Error return errors.Wrap(err, "failed to upsert settled task") } diff --git a/cmd/prover/db/db.go b/cmd/prover/db/db.go index b2876318..1a4b418b 100644 --- a/cmd/prover/db/db.go +++ b/cmd/prover/db/db.go @@ -123,7 +123,7 @@ func (p *DB) CreateTask(projectID uint64, taskID common.Hash, prover common.Addr } err := p.db.Clauses(clause.OnConflict{ Columns: []clause.Column{{Name: "task_id"}, {Name: "project_id"}}, - DoUpdates: clause.AssignmentColumns([]string{}), + DoNothing: true, }).Create(&t).Error return errors.Wrap(err, "failed to upsert task") } diff --git a/cmd/sequencer/config/config.go b/cmd/sequencer/config/config.go index f57ea021..e3420a68 100644 --- a/cmd/sequencer/config/config.go +++ b/cmd/sequencer/config/config.go @@ -30,6 +30,7 @@ var ( BootNodeMultiAddr: "/dns4/bootnode-0.testnet.iotex.one/tcp/4689/ipfs/12D3KooWFnaTYuLo8Mkbm3wzaWHtUuaxBRe24Uiopu15Wr5EhD3o", IoTeXChainID: 2, ChainEndpoint: "https://babel-api.testnet.iotex.io", + OperatorPrvKey: "33e6ba3e033131026903f34dfa208feb88c284880530cf76280b68d38041c67b", ProverContractAddr: "0xf9b850A50Ef236CADf4406Edf5a0B588142D238D", DaoContractAddr: "0xA7b3c2a257693363a9f043CC9338DbA88E1f83aF", MinterContractAddr: "0x102a1352557B3f6c65FBb44bF7959F8eacC30992", diff --git a/task/assigner/assigner.go b/task/assigner/assigner.go index 621fbf56..9ecacf36 100644 --- a/task/assigner/assigner.go +++ b/task/assigner/assigner.go @@ -16,16 +16,11 @@ import ( "github.com/pkg/errors" "golang.org/x/exp/rand" - "github.com/ethereum/go-ethereum/log" "github.com/iotexproject/w3bstream/block" "github.com/iotexproject/w3bstream/cmd/sequencer/api" "github.com/iotexproject/w3bstream/smartcontracts/go/minter" ) -func init() { - log.Root().SetHandler(log.StdoutHandler) -} - type DB interface { BlockHead() (uint64, common.Hash, error) NBits() (uint32, error)