forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 18:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

miner, XDPoS, XDC: close chanels by owner, close XFN-41 (#1641)

Browse source
This commit is contained in:
Daniel Liu 2025-11-03 17:22:31 +08:00 committed by GitHub
parent 5a26279c1c
commit d451580b37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/XDC/main.go
View file

@ -267,6 +267,9 @@ func XDC(ctx *cli.Context) error {
defer stack.Close() defer stack.Close()
startNode(ctx, stack, backend, cfg, false) startNode(ctx, stack, backend, cfg, false)
stack.Wait() stack.Wait()
if engine, ok := backend.Engine().(*XDPoS.XDPoS); ok {
engine.Stop()
}
return nil return nil
} }

9
consensus/XDPoS/XDPoS.go
View file

@ -119,6 +119,14 @@ func New(chainConfig *params.ChainConfig, db ethdb.Database) *XDPoS {
} }
} }
// Stop stops the consensus engine:
// - close chanel MinePeriodCh
// - close chanel NewRoundCh
func (x *XDPoS) Stop() {
close(x.MinePeriodCh)
close(x.NewRoundCh)
}
// NewFullFaker creates an ethash consensus engine with a full fake scheme that // NewFullFaker creates an ethash consensus engine with a full fake scheme that
// accepts all blocks as valid, without checking any consensus rules whatsoever. // accepts all blocks as valid, without checking any consensus rules whatsoever.
func NewFaker(db ethdb.Database, chainConfig *params.ChainConfig) *XDPoS { func NewFaker(db ethdb.Database, chainConfig *params.ChainConfig) *XDPoS {
@ -224,7 +232,6 @@ func (x *XDPoS) VerifyHeaders(chain consensus.ChainReader, headers []*types.Head
} }
} }
if v1headers != nil { if v1headers != nil {
x.EngineV1.VerifyHeaders(chain, v1headers, v1fullVerifies, abort, results) x.EngineV1.VerifyHeaders(chain, v1headers, v1fullVerifies, abort, results)
} }

2
miner/worker.go
View file

@ -277,9 +277,7 @@ func (w *worker) update() {
// timeout waiting for v1 initial value // timeout waiting for v1 initial value
minePeriod := 2 minePeriod := 2
MinePeriodCh := w.engine.(*XDPoS.XDPoS).MinePeriodCh MinePeriodCh := w.engine.(*XDPoS.XDPoS).MinePeriodCh
defer close(MinePeriodCh)
NewRoundCh := w.engine.(*XDPoS.XDPoS).NewRoundCh NewRoundCh := w.engine.(*XDPoS.XDPoS).NewRoundCh
defer close(NewRoundCh)
timeout := time.NewTimer(time.Duration(minePeriod) * time.Second) timeout := time.NewTimer(time.Duration(minePeriod) * time.Second)
defer timeout.Stop() defer timeout.Stop()