Skip to content

Commit fd4d994

Browse files
committed
pump bihs
1 parent 1d25f2c commit fd4d994

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

consensus/bihs/adapter/statedb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (db *StateDB) Validate(blk bihs.Block) (err error) {
6565
return db.chain.PreExecuteBlock((*types.Block)(block))
6666
}
6767

68-
func (db *StateDB) EmptyBlock(height uint64) (bihs.Block, error) {
68+
func (db *StateDB) MakeBlock(height uint64, mustEmpty bool) (bihs.Block, error) {
6969
emptyHeader := db.prepareEmptyHeaderFunc()
7070
if emptyHeader == nil {
7171
return nil, fmt.Errorf("prepareEmptyHeaderFunc failed")

consensus/bihs/engine.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,10 @@ func (bh *BiHS) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *t
276276
func (bh *BiHS) Seal(chain consensus.ChainHeaderReader, block *types.Block, results chan<- *types.Block, stop <-chan struct{}) (err error) {
277277

278278
bh.Do(func() {
279-
bh.core.Start()
279+
err := bh.core.Start()
280+
if err != nil {
281+
log.Crit("core.Start", "err", err)
282+
}
280283
})
281284

282285
bh.core.Propose(context.Background(), (*adapter.Block)(block))

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ require (
5656
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
5757
github.com/tklauser/go-sysconf v0.3.5 // indirect
5858
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef
59-
github.com/zhiqiangxu/bihs v0.0.0-20220221134001-758994ca5ed8
59+
github.com/zhiqiangxu/bihs v0.0.0-20220302150909-eed19d2d481e
6060
github.com/zhiqiangxu/util v0.0.0-20210608123940-8b5a9fec779f
6161
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
6262
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,10 @@ github.com/zhiqiangxu/bihs v0.0.0-20220220105359-0df6181f96c6 h1:DJx8j55Kq5VW3Ih
551551
github.com/zhiqiangxu/bihs v0.0.0-20220220105359-0df6181f96c6/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
552552
github.com/zhiqiangxu/bihs v0.0.0-20220221134001-758994ca5ed8 h1:yTkG6ENJI92z4oFWhTVhbahsmqwlF0TQfejjM3d7Q0U=
553553
github.com/zhiqiangxu/bihs v0.0.0-20220221134001-758994ca5ed8/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
554+
github.com/zhiqiangxu/bihs v0.0.0-20220301145624-bfc4e2c694f5 h1:A2s6sAgHa03l9ab+39vZK8hVvW9h6SpStkfbCahg6TY=
555+
github.com/zhiqiangxu/bihs v0.0.0-20220301145624-bfc4e2c694f5/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
556+
github.com/zhiqiangxu/bihs v0.0.0-20220302150909-eed19d2d481e h1:Goyz4WsesrWL/otKX2qb937XcZ/ojKDosfSL9aJikqw=
557+
github.com/zhiqiangxu/bihs v0.0.0-20220302150909-eed19d2d481e/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
554558
github.com/zhiqiangxu/rpheap v0.0.0-20191222053847-9002d7e5a1a1 h1:9i/8yn4zcZL85rmOMp9AskgJJhb2HzducF1EahdxEME=
555559
github.com/zhiqiangxu/rpheap v0.0.0-20191222053847-9002d7e5a1a1/go.mod h1:aYy7SAJP4LY667NfqoMR/ZJAy8HQ8KVtQTvEDrGS5ks=
556560
github.com/zhiqiangxu/util v0.0.0-20210608123940-8b5a9fec779f h1:Qj4r6VNJRHJOy50ixhmPerKf0r/qM+SSpuuIY5J/hiM=

0 commit comments

Comments
 (0)