Make everything compile after rebase

hashgraph · May 17, 2023 · 909dfdf · 909dfdf
1 parent f6468a1
commit 909dfdf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/InfoInjectionModule.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/InfoInjectionModule.java
@@ -43,7 +43,8 @@ static NetworkInfo provideNetworkInfo(@NonNull final com.hedera.node.app.service
 
     @Provides
     @Singleton
-    static NodeInfo provideNodeInfo(@NonNull final com.hedera.node.app.service.mono.context.NodeInfo delegate) {
-        return new MonoNodeInfo(delegate);
+    static NodeInfo provideNodeInfo(@NonNull final com.hedera.node.app.service.mono.context.NodeInfo delegate,
+                                    @NonNull final com.swirlds.common.system.InitTrigger initTrigger) {
+        return new MonoNodeInfo(delegate, initTrigger);
     }
 }
diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/meta/MonoHandleContext.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/meta/MonoHandleContext.java
@@ -124,4 +124,9 @@ public SignatureVerification verificationFor(@NonNull Key key) {
     public SignatureVerification verificationFor(@NonNull Account hollowAccount) {
         throw new UnsupportedOperationException("Not yet implemented");
     }
+
+    @Override
+    public <T> T recordBuilder(Class<T> singleTransactionRecordBuilderClass) {
+        return null;
+    }
 }
diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/BlockRecordManager.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/BlockRecordManager.java
@@ -3,9 +3,9 @@
 import com.hedera.hapi.streams.RecordStreamItem;
 import com.hedera.hapi.streams.TransactionSidecarRecord;
 import com.hedera.node.app.records.store.BlockStateStore;
-import com.hedera.node.app.spi.config.ConfigProvider;
 import com.hedera.node.app.spi.info.NodeInfo;
 import com.hedera.node.app.spi.records.SingleTransactionRecord;
+import com.hedera.node.config.ConfigProvider;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.crypto.DigestType;
 import com.swirlds.common.crypto.Hash;
@@ -43,31 +43,23 @@ public class BlockRecordManager {
     private final ConfigProvider configProvider;
     private final StreamFileProducerBase streamFileProducer;
     private final BlockStateStore blockStateStore;
-    private final ExecutorService executorService;
     private boolean eventRecoveryCompleted = false;
     private Instant provisionalCurrentBlockFirstTransactionTime = null;
     // -------------------------------------------------------------------------------------------------------
     // These fields are only accessed by the handle thread, so they do not need to be thread safe
     private final List<SingleTransactionRecord> transactionRecords = new ArrayList<>();
 
-    /**
-     * Construct BlockRecordManager using default fork join pool
-     */
-    @Inject
-    public BlockRecordManager(ConfigProvider configProvider, NodeInfo nodeInfo, BlockStateStore blockStateStore, Signer signer) {
-        this(configProvider, nodeInfo, blockStateStore, ForkJoinPool.commonPool(), signer);
-    }
-
     /**
      * Construct BlockRecordManager
      */
     @Inject
-    public BlockRecordManager(ConfigProvider configProvider, NodeInfo nodeInfo, BlockStateStore blockStateStore,
-                              ExecutorService executorService, Signer signer) {
+    public BlockRecordManager(@NonNull final ConfigProvider configProvider,
+                              @NonNull final NodeInfo nodeInfo,
+                              @NonNull final BlockStateStore blockStateStore,
+                              @NonNull final Signer signer) {
         this.configProvider = configProvider;
-        this.streamFileProducer = new StreamFileProducerConcurrent(configProvider, nodeInfo, signer, executorService);
+        this.streamFileProducer = new StreamFileProducerConcurrent(configProvider, nodeInfo, signer, ForkJoinPool.commonPool());
         this.blockStateStore = blockStateStore;
-        this.executorService = executorService;
         // check if we were started in event recover mode and if event recovery needs to be completed before we write
         // any new records to stream
         this.eventRecoveryCompleted = !nodeInfo.wasStartedInEventStreamRecovery();

diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/StreamFileProducerBase.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/StreamFileProducerBase.java
@@ -2,8 +2,8 @@
 
 import com.hedera.hapi.node.base.SemanticVersion;
 import com.hedera.hapi.streams.*;
-import com.hedera.node.app.spi.config.ConfigProvider;
 import com.hedera.node.app.spi.info.NodeInfo;
+import com.hedera.node.config.ConfigProvider;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.hedera.pbj.runtime.io.stream.WritableStreamingData;
 import com.swirlds.common.crypto.DigestType;

diff --git a/...de/hedera-app/src/main/java/com/hedera/node/app/records/StreamFileProducerConcurrent.java b/...de/hedera-app/src/main/java/com/hedera/node/app/records/StreamFileProducerConcurrent.java
@@ -4,8 +4,8 @@
 import com.hedera.hapi.streams.HashObject;
 import com.hedera.hapi.streams.RecordStreamItem;
 import com.hedera.hapi.streams.TransactionSidecarRecord;
-import com.hedera.node.app.spi.config.ConfigProvider;
 import com.hedera.node.app.spi.info.NodeInfo;
+import com.hedera.node.config.ConfigProvider;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.stream.Signer;
 import edu.umd.cs.findbugs.annotations.NonNull;

diff --git a/...edera-app/src/main/java/com/hedera/node/app/records/StreamFileProducerSingleThreaded.java b/...edera-app/src/main/java/com/hedera/node/app/records/StreamFileProducerSingleThreaded.java
@@ -4,8 +4,8 @@
 import com.hedera.hapi.streams.HashObject;
 import com.hedera.hapi.streams.RecordStreamItem;
 import com.hedera.hapi.streams.TransactionSidecarRecord;
-import com.hedera.node.app.spi.config.ConfigProvider;
 import com.hedera.node.app.spi.info.NodeInfo;
+import com.hedera.node.config.ConfigProvider;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.stream.Signer;
 import edu.umd.cs.findbugs.annotations.NonNull;