mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 14:46:42 +00:00
fixed linters
This commit is contained in:
parent
d5d106344f
commit
0ae7f0cc2b
4 changed files with 14 additions and 8 deletions
|
|
@ -1395,7 +1395,6 @@ func setEtherbase(ctx *cli.Context, cfg *ethconfig.Config) {
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg.Miner.Etherbase = common.BytesToAddress(b)
|
cfg.Miner.Etherbase = common.BytesToAddress(b)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
|
func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
|
||||||
|
|
|
||||||
|
|
@ -75,6 +75,7 @@ func New(ethone consensus.Engine) *Beacon {
|
||||||
// isPostMerge reports whether the given block number is assumed to be post-merge.
|
// isPostMerge reports whether the given block number is assumed to be post-merge.
|
||||||
// Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or
|
// Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or
|
||||||
// PoA chain for unit testing purposes.
|
// PoA chain for unit testing purposes.
|
||||||
|
// nolint : unused
|
||||||
func isPostMerge(config *params.ChainConfig, blockNum uint64, timestamp uint64) bool {
|
func isPostMerge(config *params.ChainConfig, blockNum uint64, timestamp uint64) bool {
|
||||||
mergedAtGenesis := config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0
|
mergedAtGenesis := config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0
|
||||||
return mergedAtGenesis ||
|
return mergedAtGenesis ||
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ import (
|
||||||
rpc "github.com/ethereum/go-ethereum/rpc"
|
rpc "github.com/ethereum/go-ethereum/rpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// nolint : unused
|
||||||
type TestBackend struct {
|
type TestBackend struct {
|
||||||
DB ethdb.Database
|
DB ethdb.Database
|
||||||
sections uint64
|
sections uint64
|
||||||
|
|
|
||||||
|
|
@ -1344,9 +1344,12 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
|
||||||
filter.BlobFee = uint256.MustFromBig(eip4844.CalcBlobFee(w.chainConfig, env.header))
|
filter.BlobFee = uint256.MustFromBig(eip4844.CalcBlobFee(w.chainConfig, env.header))
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
// bor: kept for reference, can remove later
|
||||||
localPlainTxs, remotePlainTxs, localBlobTxs, remoteBlobTxs map[common.Address][]*txpool.LazyTransaction
|
/*
|
||||||
)
|
var (
|
||||||
|
localPlainTxs, remotePlainTxs, localBlobTxs, remoteBlobTxs map[common.Address][]*txpool.LazyTransaction
|
||||||
|
)
|
||||||
|
*/
|
||||||
|
|
||||||
filter.OnlyPlainTxs, filter.OnlyBlobTxs = true, false
|
filter.OnlyPlainTxs, filter.OnlyBlobTxs = true, false
|
||||||
pendingPlainTxs := w.eth.TxPool().Pending(filter)
|
pendingPlainTxs := w.eth.TxPool().Pending(filter)
|
||||||
|
|
@ -1374,8 +1377,9 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
|
||||||
plainTxs := newTransactionsByPriceAndNonce(env.signer, prioPlainTxs, env.header.BaseFee)
|
plainTxs := newTransactionsByPriceAndNonce(env.signer, prioPlainTxs, env.header.BaseFee)
|
||||||
blobTxs := newTransactionsByPriceAndNonce(env.signer, prioBlobTxs, env.header.BaseFee)
|
blobTxs := newTransactionsByPriceAndNonce(env.signer, prioBlobTxs, env.header.BaseFee)
|
||||||
|
|
||||||
plainTxs = newTransactionsByPriceAndNonce(env.signer, localPlainTxs, env.header.BaseFee)
|
// bor: kept for reference, can remove later
|
||||||
blobTxs = newTransactionsByPriceAndNonce(env.signer, localBlobTxs, env.header.BaseFee)
|
// plainTxs = newTransactionsByPriceAndNonce(env.signer, localPlainTxs, env.header.BaseFee)
|
||||||
|
// blobTxs = newTransactionsByPriceAndNonce(env.signer, localBlobTxs, env.header.BaseFee)
|
||||||
|
|
||||||
if err := w.commitTransactions(env, plainTxs, blobTxs, interrupt, new(uint256.Int)); err != nil {
|
if err := w.commitTransactions(env, plainTxs, blobTxs, interrupt, new(uint256.Int)); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
@ -1385,8 +1389,9 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
|
||||||
plainTxs := newTransactionsByPriceAndNonce(env.signer, normalPlainTxs, env.header.BaseFee)
|
plainTxs := newTransactionsByPriceAndNonce(env.signer, normalPlainTxs, env.header.BaseFee)
|
||||||
blobTxs := newTransactionsByPriceAndNonce(env.signer, normalBlobTxs, env.header.BaseFee)
|
blobTxs := newTransactionsByPriceAndNonce(env.signer, normalBlobTxs, env.header.BaseFee)
|
||||||
|
|
||||||
plainTxs = newTransactionsByPriceAndNonce(env.signer, remotePlainTxs, env.header.BaseFee)
|
// bor: kept for reference, can remove later
|
||||||
blobTxs = newTransactionsByPriceAndNonce(env.signer, remoteBlobTxs, env.header.BaseFee)
|
// plainTxs = newTransactionsByPriceAndNonce(env.signer, remotePlainTxs, env.header.BaseFee)
|
||||||
|
// blobTxs = newTransactionsByPriceAndNonce(env.signer, remoteBlobTxs, env.header.BaseFee)
|
||||||
|
|
||||||
if err := w.commitTransactions(env, plainTxs, blobTxs, interrupt, new(uint256.Int)); err != nil {
|
if err := w.commitTransactions(env, plainTxs, blobTxs, interrupt, new(uint256.Int)); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue