mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

[REFACTOR] Extract connectionInfo String

Browse source
This commit is contained in:
Julian Knutsen 2019-11-21 07:40:51 -08:00
parent 944b3fffbc
commit 8208f78837
No known key found for this signature in database
GPG key ID: D85F536DB3615B2D
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
View file

@ -80,7 +80,11 @@ public class GetDataRequestHandler {
public void handle(GetDataRequest getDataRequest, final Connection connection) { public void handle(GetDataRequest getDataRequest, final Connection connection) {
long ts = System.currentTimeMillis(); long ts = System.currentTimeMillis();
GetDataResponse getDataResponse = dataStorage.buildGetDataResponse(getDataRequest, connection); String connectionInfo = "connectionInfo" + connection.getPeersNodeAddressOptional()
.map(e -> "node address " + e.getFullAddress())
.orElseGet(() -> "connection UID " + connection.getUid());
GetDataResponse getDataResponse = dataStorage.buildGetDataResponse(getDataRequest, connectionInfo, connection);
if (timeoutTimer == null) { if (timeoutTimer == null) {
timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions timeoutTimer = UserThread.runAfter(() -> { // setup before sending to avoid race conditions

14
p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
View file

@ -228,19 +228,17 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
/** /**
* Returns a GetDataResponse object that contains the Payloads known locally, but not remotely. * Returns a GetDataResponse object that contains the Payloads known locally, but not remotely.
*/ */
public GetDataResponse buildGetDataResponse(GetDataRequest getDataRequest, Connection connection) { public GetDataResponse buildGetDataResponse(GetDataRequest getDataRequest, String connectionInfo, Connection connection) {
return new GetDataResponse(getFilteredProtectedStorageEntries(getDataRequest, connection), return new GetDataResponse(getFilteredProtectedStorageEntries(getDataRequest, connectionInfo, connection),
getFilteredPersistableNetworkPayload(getDataRequest, connection), getFilteredPersistableNetworkPayload(getDataRequest, connectionInfo, connection),
getDataRequest.getNonce(), getDataRequest.getNonce(),
getDataRequest instanceof GetUpdatedDataRequest); getDataRequest instanceof GetUpdatedDataRequest);
} }
private Set<PersistableNetworkPayload> getFilteredPersistableNetworkPayload(GetDataRequest getDataRequest, private Set<PersistableNetworkPayload> getFilteredPersistableNetworkPayload(GetDataRequest getDataRequest,
String connectionInfo,
Connection connection) { Connection connection) {
Set<P2PDataStorage.ByteArray> tempLookupSet = new HashSet<>(); Set<P2PDataStorage.ByteArray> tempLookupSet = new HashSet<>();
String connectionInfo = "connectionInfo" + connection.getPeersNodeAddressOptional()
.map(e -> "node address " + e.getFullAddress())
.orElseGet(() -> "connection UID " + connection.getUid());
Set<P2PDataStorage.ByteArray> excludedKeysAsByteArray = P2PDataStorage.ByteArray.convertBytesSetToByteArraySet(getDataRequest.getExcludedKeys()); Set<P2PDataStorage.ByteArray> excludedKeysAsByteArray = P2PDataStorage.ByteArray.convertBytesSetToByteArraySet(getDataRequest.getExcludedKeys());
AtomicInteger maxSize = new AtomicInteger(MAX_ENTRIES); AtomicInteger maxSize = new AtomicInteger(MAX_ENTRIES);
@ -265,12 +263,10 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
} }
private Set<ProtectedStorageEntry> getFilteredProtectedStorageEntries(GetDataRequest getDataRequest, private Set<ProtectedStorageEntry> getFilteredProtectedStorageEntries(GetDataRequest getDataRequest,
String connectionInfo,
Connection connection) { Connection connection) {
Set<ProtectedStorageEntry> filteredDataSet = new HashSet<>(); Set<ProtectedStorageEntry> filteredDataSet = new HashSet<>();
Set<Integer> lookupSet = new HashSet<>(); Set<Integer> lookupSet = new HashSet<>();
String connectionInfo = "connectionInfo" + connection.getPeersNodeAddressOptional()
.map(e -> "node address " + e.getFullAddress())
.orElseGet(() -> "connection UID " + connection.getUid());
AtomicInteger maxSize = new AtomicInteger(MAX_ENTRIES); AtomicInteger maxSize = new AtomicInteger(MAX_ENTRIES);
Set<P2PDataStorage.ByteArray> excludedKeysAsByteArray = P2PDataStorage.ByteArray.convertBytesSetToByteArraySet(getDataRequest.getExcludedKeys()); Set<P2PDataStorage.ByteArray> excludedKeysAsByteArray = P2PDataStorage.ByteArray.convertBytesSetToByteArraySet(getDataRequest.getExcludedKeys());