From 7c1da83d43f0ce9c8651b872e56d6fc35cf954b9 Mon Sep 17 00:00:00 2001 From: garyschulte Date: Wed, 6 Dec 2023 11:49:28 -0800 Subject: [PATCH] little spotless and javadoc Signed-off-by: garyschulte --- .../java/org/hyperledger/besu/Runner.java | 5 +++ .../services/SynchronizationServiceImpl.java | 43 ++++++++++--------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/Runner.java b/besu/src/main/java/org/hyperledger/besu/Runner.java index 805ded345831..4b15b7c0b3da 100644 --- a/besu/src/main/java/org/hyperledger/besu/Runner.java +++ b/besu/src/main/java/org/hyperledger/besu/Runner.java @@ -423,6 +423,11 @@ Optional getLocalEnode() { return networkRunner.getNetwork().getLocalEnode(); } + /** + * get p2p network + * + * @return P2PNetwork + */ public P2PNetwork getP2PNetwork() { return networkRunner.getNetwork(); } diff --git a/besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java index 38477c73b39a..733a47bb4204 100644 --- a/besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java +++ b/besu/src/main/java/org/hyperledger/besu/services/SynchronizationServiceImpl.java @@ -61,9 +61,10 @@ public SynchronizationServiceImpl( this.protocolContext = protocolContext; this.protocolSchedule = protocolSchedule; this.syncState = syncState; - this.worldStateArchive = Optional.ofNullable(worldStateArchive) - .filter(z -> z instanceof BonsaiWorldStateProvider) - .map(BonsaiWorldStateProvider.class::cast); + this.worldStateArchive = + Optional.ofNullable(worldStateArchive) + .filter(z -> z instanceof BonsaiWorldStateProvider) + .map(BonsaiWorldStateProvider.class::cast); } @Override @@ -102,9 +103,7 @@ public boolean setHeadUnsafe(final BlockHeader blockHeader, final BlockBody bloc final MutableBlockchain blockchain = protocolContext.getBlockchain(); - if (worldStateArchive - .flatMap(archive -> archive.getMutable(coreHeader, true)) - .isPresent()) { + if (worldStateArchive.flatMap(archive -> archive.getMutable(coreHeader, true)).isPresent()) { if (coreHeader.getParentHash().equals(blockchain.getChainHeadHash())) { LOG.atDebug() .setMessage( @@ -131,20 +130,22 @@ public boolean isInitialSyncPhaseDone() { @Override public void disableWorldStateTrie() { // TODO MAYBE FIND A BEST WAY TO DELETE AND DISABLE TRIE - worldStateArchive.ifPresent(archive -> { - archive.getDefaultBonsaiWorldStateConfig().setTrieDisabled(true); - final BonsaiWorldStateKeyValueStorage worldStateStorage = archive.getWorldStateStorage(); - final Optional worldStateBlockHash = worldStateStorage.getWorldStateBlockHash(); - final Optional worldStateRootHash = worldStateStorage.getWorldStateRootHash(); - if (worldStateRootHash.isPresent() && worldStateBlockHash.isPresent()) { - worldStateStorage.clearTrie(); - // keep root and block hash in the trie branch - final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = worldStateStorage.updater(); - updater.saveWorldState(worldStateBlockHash.get(), Bytes32.wrap(worldStateRootHash.get()), - Bytes.EMPTY); - updater.commit(); - worldStateStorage.upgradeToFullFlatDbMode(); - } - }); + worldStateArchive.ifPresent( + archive -> { + archive.getDefaultBonsaiWorldStateConfig().setTrieDisabled(true); + final BonsaiWorldStateKeyValueStorage worldStateStorage = archive.getWorldStateStorage(); + final Optional worldStateBlockHash = worldStateStorage.getWorldStateBlockHash(); + final Optional worldStateRootHash = worldStateStorage.getWorldStateRootHash(); + if (worldStateRootHash.isPresent() && worldStateBlockHash.isPresent()) { + worldStateStorage.clearTrie(); + // keep root and block hash in the trie branch + final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = + worldStateStorage.updater(); + updater.saveWorldState( + worldStateBlockHash.get(), Bytes32.wrap(worldStateRootHash.get()), Bytes.EMPTY); + updater.commit(); + worldStateStorage.upgradeToFullFlatDbMode(); + } + }); } }