<p>New commit is <a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/bisq-network/bisq/commit/9d64022a959f0d2bd9bd4eafbd7fb1abf64bbd91/hovercard" href="https://github.com/bisq-network/bisq/commit/9d64022a959f0d2bd9bd4eafbd7fb1abf64bbd91"><tt>9d64022</tt></a></p>
<p>This is good clean up anyway, but it will make more sense with the next 2 pull requests that start changing the ProtectedStorageEntry and ProtectedMailboxStorageEntry APIs.</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/3582'>https://github.com/bisq-network/bisq/pull/3582</a></p>
<h4>Commit Summary</h4>
<ul>
<li>[TESTS] Add tests for P2PDataStorage in order to safely refactor</li>
<li>[BUGFIX] Call correct remove function in addMailboxData failure path.</li>
<li>[REFACTOR] P2PDataStorage::addPersistableNetworkPayload()</li>
<li>[REFACTOR] P2PDataStorage::addProtectedStorageEntry()</li>
<li>[REFACTOR] P2PDataStorage::refreshTTL()</li>
<li>[REFACTOR] P2PDataStorage::remove()</li>
<li>[REFACTOR] P2PDataStorage::removeMailboxData()</li>
<li>Update behavior of P2PDataStorage::addProtectedStorageEntry() on duplicates</li>
<li>Update behavior of P2PDataStorage::refreshTTL() on duplicates</li>
<li>Update behavior of P2PDataStorage::remove() & removeMailboxData() on duplicate sequence #s</li>
<li>[PR COMMENTS] Don't use the real Alert class</li>
<li>Merge branch 'add-tests' into fix-remove-bug</li>
<li>[PR COMMENTS] Don't call removeMailboxData in addMailboxData failure path</li>
<li>Merge branch 'fix-remove-bug' into refactor-add-remove-refresh</li>
<li>[PR COMMENTS] Clean up logging messages</li>
<li>Merge branch 'refactor-add-remove-refresh' into update-duplicate-behavior</li>
<li>[TESTS] Reduce concurrent failure tests to 2 concurrent operations instead of 3</li>
<li>Merge branch 'master' into add-tests</li>
<li>[PR COMMENTS] Use Client API in comments</li>
<li>Merge branch 'add-tests' into fix-remove-bug</li>
<li>[PR COMMENTS] Remove concurrent tests</li>
<li>Merge branch 'fix-remove-bug' into refactor-add-remove-refresh</li>
<li>[PR COMMENTS] Use "Client API" in transient comments</li>
<li>Merge branch 'refactor-add-remove-refresh' into update-duplicate-behavior</li>
<li>Use dependency injected Clock in P2PDataStore</li>
<li>[REFACTOR] Clean up ProtectedStorageEntry ctor</li>
<li>Add Clock parameter to ProtectedStorageEntry</li>
<li>Use Clock instead of System in ProtectedStorageEntry</li>
<li>[TESTS] Use ClockFake in tests to control time</li>
<li>[TESTS] Test onBootstrapComplete()</li>
<li>[TESTS] Lower entries required for purge in tests</li>
<li>[PR COMMENTS] Don't store Clock in ProtectedStorageEntry</li>
<li>Merge branch 'master' into add-tests</li>
<li>Merge branch 'add-tests' into fix-remove-bug</li>
<li>Merge branch 'fix-remove-bug' into refactor-add-remove-refresh</li>
<li>Merge branch 'refactor-add-remove-refresh' into update-duplicate-behavior</li>
<li>Merge branch 'update-duplicate-behavior' into manual-clock-in-tests</li>
<li>[REFACTOR] Remove duplicated code in refreshTTL</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-0">common/src/main/java/bisq/common/proto/network/NetworkProtoResolver.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-1">core/src/main/java/bisq/core/proto/CoreProtoResolver.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-2">core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-3">monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-4">monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshotBase.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-5">p2p/src/main/java/bisq/network/p2p/P2PService.java</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-6">p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java</a>
(402)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-7">p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java</a>
(66)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-8">p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStorageEntry.java</a>
(77)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-9">p2p/src/test/java/bisq/network/p2p/TestUtils.java</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-10">p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageTest.java</a>
(1673)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-11">p2p/src/test/java/bisq/network/p2p/storage/ProtectedDataStorageTest.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-12">p2p/src/test/java/bisq/network/p2p/storage/messages/AddDataMessageTest.java</a>
(4)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-13">p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java</a>
(42)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-14">p2p/src/test/java/bisq/network/p2p/storage/mocks/ClockFake.java</a>
(49)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-15">p2p/src/test/java/bisq/network/p2p/storage/mocks/DateTolerantPayloadStub.java</a>
(50)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-16">p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java</a>
(43)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-17">p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedDataStoreServiceFake.java</a>
(45)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-18">p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java</a>
(64)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/3582/files#diff-19">p2p/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker</a>
(1)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/3582.patch'>https://github.com/bisq-network/bisq/pull/3582.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/3582.diff'>https://github.com/bisq-network/bisq/pull/3582.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/3582?email_source=notifications&email_token=AJFFTNVAELEA64TS4VLSVKTQSYLETA5CNFSM4JLB62W2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HYDL6ZA">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNU5MMNBWFXJ546IBMTQSYLETANCNFSM4JLB62WQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNSRSMW2C4N3OE4OYF3QSYLETA5CNFSM4JLB62W2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HYDL6ZA.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/3582?email_source=notifications\u0026email_token=AJFFTNVAELEA64TS4VLSVKTQSYLETA5CNFSM4JLB62W2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HYDL6ZA",
"url": "https://github.com/bisq-network/bisq/pull/3582?email_source=notifications\u0026email_token=AJFFTNVAELEA64TS4VLSVKTQSYLETA5CNFSM4JLB62W2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HYDL6ZA",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>