mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use full address instead of hostname

Browse Source 
Mixing usage of host name and full name caused a few bugs in the past.
We should use only full address by default.
This commit is contained in:
Manfred Karrer 2019-04-16 23:19:54 -05:00
parent 70a950ce94
commit 683301fc23
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/arbitration/ArbitratorService.java
View File

@ -107,7 +107,7 @@ public class ArbitratorService {
.filter(data -> data.getProtectedStoragePayload() instanceof Arbitrator)
.map(data -> (Arbitrator) data.getProtectedStoragePayload())
.filter(a -> bannedArbitrators == null ||
!bannedArbitrators.contains(a.getNodeAddress().getHostName()))
!bannedArbitrators.contains(a.getNodeAddress().getFullAddress()))
.collect(Collectors.toSet());
Map<NodeAddress, Arbitrator> map = new HashMap<>();

4
core/src/main/java/bisq/core/offer/availability/ArbitratorSelection.java
View File

@ -60,13 +60,13 @@ public class ArbitratorSelection {
.collect(Collectors.toList());
Set<String> arbitrators = arbitratorManager.getArbitratorsObservableMap().values().stream()
.map(arbitrator -> arbitrator.getNodeAddress().getHostName())
.map(arbitrator -> arbitrator.getNodeAddress().getFullAddress())
.collect(Collectors.toSet());
String result = getLeastUsedArbitrator(lastAddressesUsedInTrades, arbitrators);
Optional<Arbitrator> optionalArbitrator = arbitratorManager.getArbitratorsObservableMap().values().stream()
.filter(e -> e.getNodeAddress().getHostName().equals(result))
.filter(e -> e.getNodeAddress().getFullAddress().equals(result))
.findAny();
checkArgument(optionalArbitrator.isPresent(), "optionalArbitrator has to be present");
return optionalArbitrator.get();

2
core/src/main/java/bisq/core/trade/protocol/tasks/PublishTradeStatistics.java
View File

@ -52,7 +52,7 @@ public class PublishTradeStatistics extends TradeTask {
NodeAddress arbitratorNodeAddress = trade.getArbitratorNodeAddress();
if (arbitratorNodeAddress != null) {
// The first 4 chars are sufficient to identify an arbitrator
String address = arbitratorNodeAddress.getHostName().substring(0, 4);
String address = arbitratorNodeAddress.getFullAddress().substring(0, 4);
extraDataMap.put(TradeStatistics2.ARBITRATOR_ADDRESS, address);
}