<p>Got rid of the Capability ordinals being used all over the place - a first and major step towards a cleaner, more readable Bisq code base where Bugs have less places to hide. (Done in my intention to clean up the p2p part)</p>
<p>Doing that I even managed to remove some 60 loc: some stats using <code>github.com/AlDanial/cloc v 1.80</code></p>
<table>
<thead>
<tr>
<th align="left">_</th>
<th align="right">files</th>
<th align="right">blank</th>
<th align="right">comment</th>
<th align="right">code</th>
</tr>
</thead>
<tbody>
<tr>
<td align="left">same</td>
<td align="right">0</td>
<td align="right">0</td>
<td align="right">971</td>
<td align="right">3544</td>
</tr>
<tr>
<td align="left">modified</td>
<td align="right">29</td>
<td align="right">0</td>
<td align="right">6</td>
<td align="right">148</td>
</tr>
<tr>
<td align="left">added</td>
<td align="right">1</td>
<td align="right">18</td>
<td align="right">36</td>
<td align="right">64</td>
</tr>
<tr>
<td align="left">removed</td>
<td align="right">0</td>
<td align="right">11</td>
<td align="right">3</td>
<td align="right">125</td>
</tr>
</tbody>
</table>
<h1>Note</h1>
<p>this is a fairly big change where functionality should remain the same. However, this needs thorough testing.<br>
My suggestion is that every reviewer of this PR should have a testing session with me where we do the basic things such as a simple trade so major bugs are discovered before merging.<br>
In-depth testing is done anyhow before the next release...</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/2469'>https://github.com/bisq-network/bisq/pull/2469</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Get rid of Capability ordinals</li>
<li>Removed duplicate and superfluous code</li>
<li>Make Monitor aware of refactoring</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-0">common/src/main/java/bisq/common/app/Capabilities.java</a>
(114)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-1">common/src/main/java/bisq/common/app/Capability.java</a>
(35)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-2">common/src/test/java/bisq/common/app/CapabilitiesTest.java</a>
(54)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-3">core/src/main/java/bisq/core/dao/governance/blindvote/network/RepublishGovernanceDataHandler.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-4">core/src/main/java/bisq/core/dao/governance/blindvote/network/messages/RepublishGovernanceDataRequest.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-5">core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVotePayload.java</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-6">core/src/main/java/bisq/core/dao/governance/proposal/storage/appendonly/ProposalPayload.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-7">core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-8">core/src/main/java/bisq/core/dao/node/messages/GetBlocksRequest.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-9">core/src/main/java/bisq/core/dao/node/messages/NewBlockBroadcastMessage.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-10">core/src/main/java/bisq/core/offer/messages/OfferAvailabilityRequest.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-11">core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-12">core/src/main/java/bisq/core/payment/AccountAgeWitness.java</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-13">core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java</a>
(21)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-14">core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-15">monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java</a>
(9)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-16">p2p/src/main/java/bisq/network/p2p/AckMessage.java</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-17">p2p/src/main/java/bisq/network/p2p/P2PService.java</a>
(9)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-18">p2p/src/main/java/bisq/network/p2p/SupportedCapabilitiesMessage.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-19">p2p/src/main/java/bisq/network/p2p/network/Connection.java</a>
(61)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-20">p2p/src/main/java/bisq/network/p2p/network/SupportedCapabilitiesListener.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-21">p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java</a>
(18)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-22">p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java</a>
(27)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-23">p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-24">p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-25">p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java</a>
(29)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-26">p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-27">p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java</a>
(13)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-28">p2p/src/main/java/bisq/network/p2p/storage/payload/CapabilityRequiringPayload.java</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/2469/files#diff-29">seednode/src/main/java/bisq/seednode/SeedNodeMain.java</a>
(8)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/2469.patch'>https://github.com/bisq-network/bisq/pull/2469.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/2469.diff'>https://github.com/bisq-network/bisq/pull/2469.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/2469">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtuy-_H5TL73HTIXGduWOJAyw1ROuks5vRQifgaJpZM4bRz-x">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtu3MoxTQrFJpVBP7x7-BeLlcsHQbks5vRQifgaJpZM4bRz-x.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq","title":"bisq-network/bisq","subtitle":"GitHub repository","main_image_url":"https://github.githubassets.com/images/email/message_cards/header.png","avatar_image_url":"https://github.githubassets.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Refactor capabilities (#2469)"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/2469"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/2469",
"url": "https://github.com/bisq-network/bisq/pull/2469",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>