Skip to content

Commit c7358d4

Browse files
buddh0buddh0
authored
core: clearup pascal&prague testflag and rialto code (bnb-chain#2985)
1 parent 7af2cf8 commit c7358d4

28 files changed

Lines changed: 6 additions & 229 deletions

‎cmd/geth/chaincmd.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ var (
6262
Flags: slices.Concat([]cli.Flag{
6363
utils.CachePreimagesFlag,
6464
utils.OverridePassedForkTime,
65-
utils.OverridePascal,
66-
utils.OverridePrague,
6765
utils.OverrideLorentz,
6866
utils.OverrideVerkle,
6967
utils.MultiDataBaseFlag,
@@ -261,14 +259,6 @@ func initGenesis(ctx *cli.Context) error {
261259
v := ctx.Uint64(utils.OverridePassedForkTime.Name)
262260
overrides.OverridePassedForkTime = &v
263261
}
264-
if ctx.IsSet(utils.OverridePascal.Name) {
265-
v := ctx.Uint64(utils.OverridePascal.Name)
266-
overrides.OverridePascal = &v
267-
}
268-
if ctx.IsSet(utils.OverridePrague.Name) {
269-
v := ctx.Uint64(utils.OverridePrague.Name)
270-
overrides.OverridePrague = &v
271-
}
272262
if ctx.IsSet(utils.OverrideLorentz.Name) {
273263
v := ctx.Uint64(utils.OverrideLorentz.Name)
274264
overrides.OverrideLorentz = &v

‎cmd/geth/config.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
205205
v := ctx.Uint64(utils.OverridePassedForkTime.Name)
206206
cfg.Eth.OverridePassedForkTime = &v
207207
}
208-
if ctx.IsSet(utils.OverridePascal.Name) {
209-
v := ctx.Uint64(utils.OverridePascal.Name)
210-
cfg.Eth.OverridePascal = &v
211-
}
212-
if ctx.IsSet(utils.OverridePrague.Name) {
213-
v := ctx.Uint64(utils.OverridePrague.Name)
214-
cfg.Eth.OverridePrague = &v
215-
}
216208
if ctx.IsSet(utils.OverrideLorentz.Name) {
217209
v := ctx.Uint64(utils.OverrideLorentz.Name)
218210
cfg.Eth.OverrideLorentz = &v

‎cmd/geth/main.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ var (
7474
utils.SmartCardDaemonPathFlag,
7575
utils.RialtoHash,
7676
utils.OverridePassedForkTime,
77-
utils.OverridePascal,
78-
utils.OverridePrague,
7977
utils.OverrideLorentz,
8078
utils.OverrideVerkle,
8179
utils.OverrideFullImmutabilityThreshold,

‎cmd/utils/flags.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,6 @@ var (
301301
Usage: "Manually specify the hard fork timestamps which have passed on the mainnet, overriding the bundled setting",
302302
Category: flags.EthCategory,
303303
}
304-
OverridePascal = &cli.Uint64Flag{
305-
Name: "override.pascal",
306-
Usage: "Manually specify the Pascal fork timestamp, overriding the bundled setting",
307-
Category: flags.EthCategory,
308-
}
309-
OverridePrague = &cli.Uint64Flag{
310-
Name: "override.prague",
311-
Usage: "Manually specify the Prague fork timestamp, overriding the bundled setting",
312-
Category: flags.EthCategory,
313-
}
314304
OverrideLorentz = &cli.Uint64Flag{
315305
Name: "override.lorentz",
316306
Usage: "Manually specify the Lorentz fork timestamp, overriding the bundled setting",

‎core/genesis.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ func (e *GenesisMismatchError) Error() string {
264264
// Typically, these modifications involve hardforks that are not enabled on the BSC mainnet, intended for testing purposes.
265265
type ChainOverrides struct {
266266
OverridePassedForkTime *uint64
267-
OverridePascal *uint64
268-
OverridePrague *uint64
269267
OverrideLorentz *uint64
270268
OverrideVerkle *uint64
271269
}
@@ -284,12 +282,8 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) error {
284282
cfg.HaberTime = o.OverridePassedForkTime
285283
cfg.HaberFixTime = o.OverridePassedForkTime
286284
cfg.BohrTime = o.OverridePassedForkTime
287-
}
288-
if o.OverridePascal != nil {
289-
cfg.PascalTime = o.OverridePascal
290-
}
291-
if o.OverridePrague != nil {
292-
cfg.PragueTime = o.OverridePrague
285+
cfg.PascalTime = o.OverridePassedForkTime
286+
cfg.PragueTime = o.OverridePassedForkTime
293287
}
294288
if o.OverrideLorentz != nil {
295289
cfg.LorentzTime = o.OverrideLorentz

‎core/systemcontracts/pascal/rialto/CrossChainContract‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)