reslove conflict master<->dev

HorizenOfficial · Mar 24, 2021 · b6b533e · b6b533e
1 parent 254728b
commit b6b533e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sdk/src/main/scala/com/horizen/SidechainAppModule.scala b/sdk/src/main/scala/com/horizen/SidechainAppModule.scala
@@ -54,6 +54,7 @@ abstract class SidechainAppModule extends com.google.inject.AbstractModule {
                     @Named("WalletBoxStorage")  walletBoxStorage: Storage,
                     @Named("WalletTransactionStorage")  walletTransactionStorage: Storage,
                     @Named("StateStorage")  stateStorage: Storage,
+                    @Named("StateForgerBoxStorage") forgerBoxStorage: Storage,
                     @Named("HistoryStorage")  historyStorage: Storage,
                     @Named("WalletForgingBoxesInfoStorage")  walletForgingBoxesInfoStorage: Storage,
                     @Named("ConsensusStorage")  consensusStorage: Storage,
@@ -77,6 +78,7 @@ abstract class SidechainAppModule extends com.google.inject.AbstractModule {
           walletBoxStorage,
           walletTransactionStorage,
           stateStorage,
+          forgerBoxStorage,
           historyStorage,
           walletForgingBoxesInfoStorage,
           consensusStorage,