<p>follow up to <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="477459605" data-permission-text="Issue title is private" data-url="https://github.com/bisq-network/bisq/issues/3058" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/3058/hovercard" href="https://github.com/bisq-network/bisq/pull/3058">#3058</a> that converts the core module too.<br>
and unit test it all</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/bisq-network/bisq/pull/3061'>https://github.com/bisq-network/bisq/pull/3061</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>bump guice version and start testing desktop guice setup</li>
  <li>don't fail if there is no shutdown hook.</li>
  <li>use singleton annotation instead of binding as singleton.</li>
  <li>update witness file for new guice version</li>
  <li>convert some of the core config</li>
  <li>more singletoning</li>
  <li>even more singletoning</li>
  <li>singletonify the rest of the core module</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-0">build.gradle</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-1">common/src/main/java/bisq/common/ClockWatcher.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-2">common/src/main/java/bisq/common/crypto/KeyRing.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-3">common/src/main/java/bisq/common/crypto/KeyStorage.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-4">common/src/main/java/bisq/common/storage/CorruptedDatabaseFilesHandler.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-5">core/src/main/java/bisq/core/CoreModule.java</a>
    (51)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-6">core/src/main/java/bisq/core/app/AvoidStandbyModeService.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-7">core/src/main/java/bisq/core/app/BisqSetup.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-8">core/src/main/java/bisq/core/app/P2PNetworkSetup.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-9">core/src/main/java/bisq/core/app/TorSetup.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-10">core/src/main/java/bisq/core/app/WalletAppSetup.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-11">core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-12">core/src/main/java/bisq/core/notifications/MobileModel.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-13">core/src/main/java/bisq/core/notifications/MobileNotificationService.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-14">core/src/main/java/bisq/core/notifications/MobileNotificationValidator.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-15">core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-16">core/src/main/java/bisq/core/notifications/alerts/MyOfferTakenEvents.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-17">core/src/main/java/bisq/core/notifications/alerts/TradeEvents.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-18">core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-19">core/src/main/java/bisq/core/notifications/alerts/price/PriceAlert.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-20">core/src/main/java/bisq/core/payment/TradeLimits.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-21">core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-22">core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-23">core/src/main/java/bisq/core/user/Preferences.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-24">core/src/main/java/bisq/core/user/User.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-25">core/src/main/java/bisq/core/util/BSFormatter.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-26">core/src/main/java/bisq/core/util/BsqFormatter.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-27">desktop/src/main/java/bisq/desktop/DesktopModule.java</a>
    (36)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-28">desktop/src/main/java/bisq/desktop/Navigation.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-29">desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-30">desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-31">desktop/src/main/java/bisq/desktop/common/view/guice/InjectorViewFactory.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-32">desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-33">desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsFactory.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-34">desktop/src/main/java/bisq/desktop/main/funds/transactions/TradableRepository.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-35">desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-36">desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionListItemFactory.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-37">desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-38">desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-39">desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-40">desktop/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-41">desktop/src/main/java/bisq/desktop/main/presentation/DaoPresentation.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-42">desktop/src/main/java/bisq/desktop/main/presentation/MarketPricePresentation.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-43">desktop/src/main/java/bisq/desktop/util/Transitions.java</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-44">desktop/src/test/java/bisq/desktop/GuiceSetupTest.java</a>
    (133)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/3061/files#diff-45">gradle/witness/gradle-witness.gradle</a>
    (3)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/3061.patch'>https://github.com/bisq-network/bisq/pull/3061.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/3061.diff'>https://github.com/bisq-network/bisq/pull/3061.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3061?email_source=notifications&email_token=AJFFTNS2TJAAXFEOW7YPHIDQDKMB7A5CNFSM4IJ6SNNKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HD3CGQQ">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNRRHMDUVVZSYBIJIYDQDKMB7ANCNFSM4IJ6SNNA">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNVFVEFSXRYJJ43K34DQDKMB7A5CNFSM4IJ6SNNKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HD3CGQQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/3061?email_source=notifications\u0026email_token=AJFFTNS2TJAAXFEOW7YPHIDQDKMB7A5CNFSM4IJ6SNNKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HD3CGQQ",
"url": "https://github.com/bisq-network/bisq/pull/3061?email_source=notifications\u0026email_token=AJFFTNS2TJAAXFEOW7YPHIDQDKMB7A5CNFSM4IJ6SNNKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HD3CGQQ",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>