Skip to content

Commit

Permalink
refac(light): remove unneeded member variable
Browse files Browse the repository at this point in the history
  • Loading branch information
chokobole committed Dec 17, 2022
1 parent 7445223 commit a6832ed
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions light/txpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ type TxPool struct {

istanbul bool // Fork indicator whether we are in the istanbul stage.
eip2718 bool // Fork indicator whether we are in the eip2718 stage.

// [Scroll: START]
// NOTE(chokobole): This part is different from scroll
zktrie bool
// [Scroll: END]
}

// TxRelayBackend provides an interface to the mechanism that forwards transactions to the
Expand Down Expand Up @@ -109,10 +104,6 @@ func NewTxPool(config *params.ChainConfig, chain *LightChain, relay TxRelayBacke
chainDb: chain.Odr().Database(),
head: chain.CurrentHeader().Hash(),
clearIdx: chain.CurrentHeader().Number.Uint64(),
// [Scroll: START]
// NOTE(chokobole): This part is different from scroll
zktrie: config.Zktrie,
// [Scroll: END]
}
// Subscribe events from blockchain
pool.chainHeadSub = pool.chain.SubscribeChainHeadEvent(pool.chainHeadCh)
Expand All @@ -125,7 +116,7 @@ func NewTxPool(config *params.ChainConfig, chain *LightChain, relay TxRelayBacke
func (pool *TxPool) currentState(ctx context.Context) *state.StateDB {
// [Scroll: START]
// NOTE(chokobole): This part is different from scroll
return NewState(ctx, pool.chain.CurrentHeader(), pool.odr, pool.zktrie)
return NewState(ctx, pool.chain.CurrentHeader(), pool.odr, pool.config.Zktrie)
// [Scroll: END]
}

Expand Down

0 comments on commit a6832ed

Please sign in to comment.