Skip to content
This repository was archived by the owner on Jul 1, 2025. It is now read-only.

Commit c9a9f76

Browse files
jflogaryschulte
jflo
authored and
garyschulte
committed
rename GenesisConfigFile because it's not a file at all (#8050)
Signed-off-by: jflo <[email protected]>
1 parent 6a2b7c4 commit c9a9f76

File tree

71 files changed

+439
-461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+439
-461
lines changed

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
2020

2121
import org.hyperledger.besu.config.CliqueConfigOptions;
22-
import org.hyperledger.besu.config.GenesisConfigFile;
22+
import org.hyperledger.besu.config.GenesisConfig;
2323
import org.hyperledger.besu.datatypes.Address;
2424
import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
2525
import org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain.ExpectBlockNotCreated;
@@ -89,9 +89,9 @@ public Condition awaitSignerSetChange(final Node node) {
8989

9090
private int cliqueBlockPeriod(final BesuNode node) {
9191
final String config = node.getGenesisConfigProvider().create(emptyList()).get();
92-
final GenesisConfigFile genesisConfigFile = GenesisConfigFile.fromConfig(config);
92+
final GenesisConfig genesisConfig = GenesisConfig.fromConfig(config);
9393
final CliqueConfigOptions cliqueConfigOptions =
94-
genesisConfigFile.getConfigOptions().getCliqueConfigOptions();
94+
genesisConfig.getConfigOptions().getCliqueConfigOptions();
9595
return cliqueConfigOptions.getBlockPeriodSeconds();
9696
}
9797

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.hyperledger.besu.cli.config.EthNetworkConfig;
2626
import org.hyperledger.besu.cli.config.NetworkName;
2727
import org.hyperledger.besu.components.BesuComponent;
28-
import org.hyperledger.besu.config.GenesisConfigFile;
28+
import org.hyperledger.besu.config.GenesisConfig;
2929
import org.hyperledger.besu.controller.BesuController;
3030
import org.hyperledger.besu.controller.BesuControllerBuilder;
3131
import org.hyperledger.besu.crypto.KeyPairUtil;
@@ -155,8 +155,8 @@ public void startNode(final BesuNode node) {
155155
networkConfigBuilder.setBootNodes(bootnodes);
156156
node.getConfiguration()
157157
.getGenesisConfig()
158-
.map(GenesisConfigFile::fromConfig)
159-
.ifPresent(networkConfigBuilder::setGenesisConfigFile);
158+
.map(GenesisConfig::fromConfig)
159+
.ifPresent(networkConfigBuilder::setGenesisConfig);
160160
final EthNetworkConfig ethNetworkConfig = networkConfigBuilder.build();
161161
final BesuControllerBuilder builder = component.besuControllerBuilder();
162162
builder.isRevertReasonEnabled(node.isRevertReasonEnabled());
@@ -166,9 +166,7 @@ public void startNode(final BesuNode node) {
166166
builder.nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))));
167167
builder.privacyParameters(node.getPrivacyParameters());
168168

169-
node.getGenesisConfig()
170-
.map(GenesisConfigFile::fromConfig)
171-
.ifPresent(builder::genesisConfigFile);
169+
node.getGenesisConfig().map(GenesisConfig::fromConfig).ifPresent(builder::genesisConfig);
172170

173171
final BesuController besuController = component.besuController();
174172

‎besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
import org.hyperledger.besu.cli.util.VersionProvider;
8686
import org.hyperledger.besu.components.BesuComponent;
8787
import org.hyperledger.besu.config.CheckpointConfigOptions;
88-
import org.hyperledger.besu.config.GenesisConfigFile;
88+
import org.hyperledger.besu.config.GenesisConfig;
8989
import org.hyperledger.besu.config.GenesisConfigOptions;
9090
import org.hyperledger.besu.config.MergeConfiguration;
9191
import org.hyperledger.besu.controller.BesuController;
@@ -332,8 +332,8 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
332332
new PreSynchronizationTaskRunner();
333333

334334
private final Set<Integer> allocatedPorts = new HashSet<>();
335-
private final Supplier<GenesisConfigFile> genesisConfigFileSupplier =
336-
Suppliers.memoize(this::readGenesisConfigFile);
335+
private final Supplier<GenesisConfig> genesisConfigSupplier =
336+
Suppliers.memoize(this::readGenesisConfig);
337337
private final Supplier<GenesisConfigOptions> genesisConfigOptionsSupplier =
338338
Suppliers.memoize(this::readGenesisConfigOptions);
339339
private final Supplier<MiningConfiguration> miningParametersSupplier =
@@ -1587,21 +1587,21 @@ private void validateChainDataPruningParams() {
15871587
}
15881588
}
15891589

1590-
private GenesisConfigFile readGenesisConfigFile() {
1591-
GenesisConfigFile effectiveGenesisFile;
1590+
private GenesisConfig readGenesisConfig() {
1591+
GenesisConfig effectiveGenesisFile;
15921592
effectiveGenesisFile =
15931593
network.equals(EPHEMERY)
15941594
? EphemeryGenesisUpdater.updateGenesis(genesisConfigOverrides)
15951595
: genesisFile != null
1596-
? GenesisConfigFile.fromSource(genesisConfigSource(genesisFile))
1597-
: GenesisConfigFile.fromResource(
1596+
? GenesisConfig.fromSource(genesisConfigSource(genesisFile))
1597+
: GenesisConfig.fromResource(
15981598
Optional.ofNullable(network).orElse(MAINNET).getGenesisFile());
15991599
return effectiveGenesisFile.withOverrides(genesisConfigOverrides);
16001600
}
16011601

16021602
private GenesisConfigOptions readGenesisConfigOptions() {
16031603
try {
1604-
return genesisConfigFileSupplier.get().getConfigOptions();
1604+
return genesisConfigSupplier.get().getConfigOptions();
16051605
} catch (final Exception e) {
16061606
throw new ParameterException(
16071607
this.commandLine, "Unable to load genesis file. " + e.getCause());
@@ -2337,7 +2337,7 @@ private EthNetworkConfig updateNetworkConfig(final NetworkName network) {
23372337
builder.setDnsDiscoveryUrl(null);
23382338
}
23392339

2340-
builder.setGenesisConfigFile(genesisConfigFileSupplier.get());
2340+
builder.setGenesisConfig(genesisConfigSupplier.get());
23412341

23422342
if (networkId != null) {
23432343
builder.setNetworkId(networkId);

‎besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
package org.hyperledger.besu.cli.config;
1616

17-
import org.hyperledger.besu.config.GenesisConfigFile;
17+
import org.hyperledger.besu.config.GenesisConfig;
1818
import org.hyperledger.besu.config.GenesisConfigOptions;
1919
import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
2020
import org.hyperledger.besu.plugin.data.EnodeURL;
@@ -33,29 +33,29 @@
3333
/**
3434
* The Eth network config.
3535
*
36-
* @param genesisConfigFile Genesis Config File
36+
* @param genesisConfig Genesis Config File
3737
* @param networkId Network Id
3838
* @param bootNodes Boot Nodes
3939
* @param dnsDiscoveryUrl DNS Discovery URL
4040
*/
4141
public record EthNetworkConfig(
42-
GenesisConfigFile genesisConfigFile,
42+
GenesisConfig genesisConfig,
4343
BigInteger networkId,
4444
List<EnodeURL> bootNodes,
4545
String dnsDiscoveryUrl) {
4646

4747
/**
4848
* Validate parameters on new record creation
4949
*
50-
* @param genesisConfigFile the genesis config
50+
* @param genesisConfig the genesis config
5151
* @param networkId the network id
5252
* @param bootNodes the boot nodes
5353
* @param dnsDiscoveryUrl the dns discovery url
5454
*/
5555
@SuppressWarnings(
5656
"MethodInputParametersMustBeFinal") // needed since record constructors are not yet supported
5757
public EthNetworkConfig {
58-
Objects.requireNonNull(genesisConfigFile);
58+
Objects.requireNonNull(genesisConfig);
5959
Objects.requireNonNull(bootNodes);
6060
}
6161

@@ -67,8 +67,8 @@ public record EthNetworkConfig(
6767
*/
6868
public static EthNetworkConfig getNetworkConfig(final NetworkName networkName) {
6969
final URL genesisSource = jsonConfigSource(networkName.getGenesisFile());
70-
final GenesisConfigFile genesisConfigFile = GenesisConfigFile.fromSource(genesisSource);
71-
final GenesisConfigOptions genesisConfigOptions = genesisConfigFile.getConfigOptions();
70+
final GenesisConfig genesisConfig = GenesisConfig.fromSource(genesisSource);
71+
final GenesisConfigOptions genesisConfigOptions = genesisConfig.getConfigOptions();
7272
final Optional<List<String>> rawBootNodes =
7373
genesisConfigOptions.getDiscoveryOptions().getBootNodes();
7474
final List<EnodeURL> bootNodes =
@@ -79,7 +79,7 @@ public static EthNetworkConfig getNetworkConfig(final NetworkName networkName) {
7979
.orElse(Collections.emptyList());
8080

8181
return new EthNetworkConfig(
82-
genesisConfigFile,
82+
genesisConfig,
8383
networkName.getNetworkId(),
8484
bootNodes,
8585
genesisConfigOptions.getDiscoveryOptions().getDiscoveryDnsUrl().orElse(null));
@@ -108,7 +108,7 @@ public static String jsonConfig(final NetworkName network) {
108108
public static class Builder {
109109

110110
private String dnsDiscoveryUrl;
111-
private GenesisConfigFile genesisConfigFile;
111+
private GenesisConfig genesisConfig;
112112
private BigInteger networkId;
113113
private List<EnodeURL> bootNodes;
114114

@@ -118,7 +118,7 @@ public static class Builder {
118118
* @param ethNetworkConfig the eth network config
119119
*/
120120
public Builder(final EthNetworkConfig ethNetworkConfig) {
121-
this.genesisConfigFile = ethNetworkConfig.genesisConfigFile;
121+
this.genesisConfig = ethNetworkConfig.genesisConfig;
122122
this.networkId = ethNetworkConfig.networkId;
123123
this.bootNodes = ethNetworkConfig.bootNodes;
124124
this.dnsDiscoveryUrl = ethNetworkConfig.dnsDiscoveryUrl;
@@ -127,11 +127,11 @@ public Builder(final EthNetworkConfig ethNetworkConfig) {
127127
/**
128128
* Sets genesis config file.
129129
*
130-
* @param genesisConfigFile the genesis config
130+
* @param genesisConfig the genesis config
131131
* @return this builder
132132
*/
133-
public Builder setGenesisConfigFile(final GenesisConfigFile genesisConfigFile) {
134-
this.genesisConfigFile = genesisConfigFile;
133+
public Builder setGenesisConfig(final GenesisConfig genesisConfig) {
134+
this.genesisConfig = genesisConfig;
135135
return this;
136136
}
137137

@@ -174,7 +174,7 @@ public Builder setDnsDiscoveryUrl(final String dnsDiscoveryUrl) {
174174
* @return the eth network config
175175
*/
176176
public EthNetworkConfig build() {
177-
return new EthNetworkConfig(genesisConfigFile, networkId, bootNodes, dnsDiscoveryUrl);
177+
return new EthNetworkConfig(genesisConfig, networkId, bootNodes, dnsDiscoveryUrl);
178178
}
179179
}
180180
}

‎besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.hyperledger.besu.cli.DefaultCommandValues;
2121
import org.hyperledger.besu.cli.util.VersionProvider;
22-
import org.hyperledger.besu.config.GenesisConfigFile;
22+
import org.hyperledger.besu.config.GenesisConfig;
2323
import org.hyperledger.besu.config.GenesisConfigOptions;
2424
import org.hyperledger.besu.config.JsonGenesisConfigOptions;
2525
import org.hyperledger.besu.config.JsonUtil;
@@ -286,7 +286,7 @@ private void parseConfig() throws IOException {
286286

287287
/** Sets the selected signature algorithm instance in SignatureAlgorithmFactory. */
288288
private void processEcCurve() {
289-
GenesisConfigOptions options = GenesisConfigFile.fromConfig(genesisConfig).getConfigOptions();
289+
GenesisConfigOptions options = GenesisConfig.fromConfig(genesisConfig).getConfigOptions();
290290
Optional<String> ecCurve = options.getEcCurve();
291291

292292
if (ecCurve.isEmpty()) {

‎besu/src/main/java/org/hyperledger/besu/controller/BesuController.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package org.hyperledger.besu.controller;
1616

1717
import org.hyperledger.besu.cli.config.EthNetworkConfig;
18-
import org.hyperledger.besu.config.GenesisConfigFile;
18+
import org.hyperledger.besu.config.GenesisConfig;
1919
import org.hyperledger.besu.config.GenesisConfigOptions;
2020
import org.hyperledger.besu.config.PowAlgorithm;
2121
import org.hyperledger.besu.config.QbftConfigOptions;
@@ -334,24 +334,24 @@ public Builder() {}
334334
*/
335335
public BesuControllerBuilder fromEthNetworkConfig(
336336
final EthNetworkConfig ethNetworkConfig, final SyncMode syncMode) {
337-
return fromGenesisFile(ethNetworkConfig.genesisConfigFile(), syncMode)
337+
return fromGenesisFile(ethNetworkConfig.genesisConfig(), syncMode)
338338
.networkId(ethNetworkConfig.networkId());
339339
}
340340

341341
/**
342342
* From genesis config besu controller builder.
343343
*
344-
* @param genesisConfigFile the genesis config file
344+
* @param genesisConfig the genesis config file
345345
* @param syncMode the sync mode
346346
* @return the besu controller builder
347347
*/
348348
public BesuControllerBuilder fromGenesisFile(
349-
final GenesisConfigFile genesisConfigFile, final SyncMode syncMode) {
349+
final GenesisConfig genesisConfig, final SyncMode syncMode) {
350350
final BesuControllerBuilder builder;
351-
final var configOptions = genesisConfigFile.getConfigOptions();
351+
final var configOptions = genesisConfig.getConfigOptions();
352352

353353
if (configOptions.isConsensusMigration()) {
354-
return createConsensusScheduleBesuControllerBuilder(genesisConfigFile);
354+
return createConsensusScheduleBesuControllerBuilder(genesisConfig);
355355
}
356356

357357
if (configOptions.getPowAlgorithm() != PowAlgorithm.UNSUPPORTED) {
@@ -373,22 +373,22 @@ public BesuControllerBuilder fromGenesisFile(
373373
if (configOptions.getTerminalTotalDifficulty().isPresent()) {
374374
// Enable start with vanilla MergeBesuControllerBuilder for PoS checkpoint block
375375
if (syncMode == SyncMode.CHECKPOINT && isCheckpointPoSBlock(configOptions)) {
376-
return new MergeBesuControllerBuilder().genesisConfigFile(genesisConfigFile);
376+
return new MergeBesuControllerBuilder().genesisConfig(genesisConfig);
377377
} else {
378378
// TODO this should be changed to vanilla MergeBesuControllerBuilder and the Transition*
379379
// series of classes removed after we successfully transition to PoS
380380
// https://github.com/hyperledger/besu/issues/2897
381381
return new TransitionBesuControllerBuilder(builder, new MergeBesuControllerBuilder())
382-
.genesisConfigFile(genesisConfigFile);
382+
.genesisConfig(genesisConfig);
383383
}
384384

385-
} else return builder.genesisConfigFile(genesisConfigFile);
385+
} else return builder.genesisConfig(genesisConfig);
386386
}
387387

388388
private BesuControllerBuilder createConsensusScheduleBesuControllerBuilder(
389-
final GenesisConfigFile genesisConfigFile) {
389+
final GenesisConfig genesisConfig) {
390390
final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule = new HashMap<>();
391-
final var configOptions = genesisConfigFile.getConfigOptions();
391+
final var configOptions = genesisConfig.getConfigOptions();
392392

393393
final BesuControllerBuilder originalControllerBuilder;
394394
if (configOptions.isIbft2()) {
@@ -407,7 +407,7 @@ private BesuControllerBuilder createConsensusScheduleBesuControllerBuilder(
407407
besuControllerBuilderSchedule.put(qbftBlock, new QbftBesuControllerBuilder());
408408

409409
return new ConsensusScheduleBesuControllerBuilder(besuControllerBuilderSchedule)
410-
.genesisConfigFile(genesisConfigFile);
410+
.genesisConfig(genesisConfig);
411411
}
412412

413413
private Long readQbftStartBlockConfig(final QbftConfigOptions qbftConfigOptions) {

‎besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.hyperledger.besu.components.BesuComponent;
2020
import org.hyperledger.besu.config.CheckpointConfigOptions;
21-
import org.hyperledger.besu.config.GenesisConfigFile;
21+
import org.hyperledger.besu.config.GenesisConfig;
2222
import org.hyperledger.besu.config.GenesisConfigOptions;
2323
import org.hyperledger.besu.consensus.merge.MergeContext;
2424
import org.hyperledger.besu.consensus.merge.UnverifiedForkchoiceSupplier;
@@ -127,7 +127,7 @@ public abstract class BesuControllerBuilder implements MiningParameterOverrides
127127
private static final Logger LOG = LoggerFactory.getLogger(BesuControllerBuilder.class);
128128

129129
/** The genesis file */
130-
protected GenesisConfigFile genesisConfigFile;
130+
protected GenesisConfig genesisConfig;
131131

132132
/** The genesis config options; */
133133
protected GenesisConfigOptions genesisConfigOptions;
@@ -250,8 +250,8 @@ public BesuControllerBuilder storageProvider(final StorageProvider storageProvid
250250
* @param genesisConfig the genesis config
251251
* @return the besu controller builder
252252
*/
253-
public BesuControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) {
254-
this.genesisConfigFile = genesisConfig;
253+
public BesuControllerBuilder genesisConfig(final GenesisConfig genesisConfig) {
254+
this.genesisConfig = genesisConfig;
255255
this.genesisConfigOptions = genesisConfig.getConfigOptions();
256256
return this;
257257
}
@@ -559,7 +559,7 @@ public BesuControllerBuilder isParallelTxProcessingEnabled(
559559
* @return the besu controller
560560
*/
561561
public BesuController build() {
562-
checkNotNull(genesisConfigFile, "Missing genesis config file");
562+
checkNotNull(genesisConfig, "Missing genesis config file");
563563
checkNotNull(genesisConfigOptions, "Missing genesis config options");
564564
checkNotNull(syncConfig, "Missing sync config");
565565
checkNotNull(ethereumWireProtocolConfiguration, "Missing ethereum protocol configuration");
@@ -840,11 +840,10 @@ private GenesisState getGenesisState(
840840
return maybeGenesisStateRoot
841841
.map(
842842
genesisStateRoot ->
843-
GenesisState.fromStorage(genesisStateRoot, genesisConfigFile, protocolSchedule))
843+
GenesisState.fromStorage(genesisStateRoot, genesisConfig, protocolSchedule))
844844
.orElseGet(
845845
() ->
846-
GenesisState.fromConfig(
847-
dataStorageConfiguration, genesisConfigFile, protocolSchedule));
846+
GenesisState.fromConfig(dataStorageConfiguration, genesisConfig, protocolSchedule));
848847
}
849848

850849
private TrieLogPruner createTrieLogPruner(

‎besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
1818

19-
import org.hyperledger.besu.config.GenesisConfigFile;
19+
import org.hyperledger.besu.config.GenesisConfig;
2020
import org.hyperledger.besu.consensus.common.CombinedProtocolScheduleFactory;
2121
import org.hyperledger.besu.consensus.common.ForkSpec;
2222
import org.hyperledger.besu.consensus.common.ForksSchedule;
@@ -264,9 +264,9 @@ public BesuControllerBuilder storageProvider(final StorageProvider storageProvid
264264
}
265265

266266
@Override
267-
public BesuControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) {
268-
besuControllerBuilderSchedule.values().forEach(b -> b.genesisConfigFile(genesisConfig));
269-
return super.genesisConfigFile(genesisConfig);
267+
public BesuControllerBuilder genesisConfig(final GenesisConfig genesisConfig) {
268+
besuControllerBuilderSchedule.values().forEach(b -> b.genesisConfig(genesisConfig));
269+
return super.genesisConfig(genesisConfig);
270270
}
271271

272272
@Override

0 commit comments

Comments
 (0)