Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 15:40:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

refactor node addresses and pub key rings to TradingPeer (#460)

Browse source
This commit is contained in:
woodser 2022-10-01 13:29:38 -04:00 • committed by GitHub
parent c153afff67
commit 5fbc41946e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 227 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View file

@ -142,7 +142,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
.isPresent();
isPaymentAccountUsed = isPaymentAccountUsed || tradeManager.getObservableList().stream()
.filter(t -> t.getOffer().getMakerPaymentAccountId().equals(paymentAccount.getId()) ||
paymentAccount.getId().equals(t.getTakerPaymentAccountId()))
paymentAccount.getId().equals(t.getTaker().getPaymentAccountId()))
.findAny()
.isPresent();
if (!isPaymentAccountUsed)

2
desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java
View file

@ -147,7 +147,7 @@ class FiatAccountsDataModel extends ActivatableDataModel {
.anyMatch(o -> o.getOffer().getMakerPaymentAccountId().equals(paymentAccount.getId()));
isPaymentAccountUsed = isPaymentAccountUsed || tradeManager.getObservableList().stream()
.anyMatch(t -> t.getOffer().getMakerPaymentAccountId().equals(paymentAccount.getId()) ||
paymentAccount.getId().equals(t.getTakerPaymentAccountId()));
paymentAccount.getId().equals(t.getTaker().getPaymentAccountId()));
if (!isPaymentAccountUsed)
user.removePaymentAccount(paymentAccount);
return isPaymentAccountUsed;

8
desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -208,7 +208,7 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
rows++;
if (trade.hasFailed())
rows += 2;
if (trade.getTradingPeerNodeAddress() != null)
if (trade.getTradingPeer().getNodeAddress() != null)
rows++;
if (showXmrProofResult)
rows++;
@ -232,16 +232,16 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
Res.get("shared.takerTxFee", formatter.formatCoinWithCode(trade.getTxFee().multiply(3)));
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("tradeDetailsWindow.txFee"), txFee);
NodeAddress arbitratorNodeAddress = trade.getArbitratorNodeAddress();
NodeAddress arbitratorNodeAddress = trade.getArbitrator().getNodeAddress();
if (arbitratorNodeAddress != null) {
addConfirmationLabelTextField(gridPane, ++rowIndex,
Res.get("tradeDetailsWindow.agentAddresses"),
arbitratorNodeAddress.getFullAddress());
}
if (trade.getTradingPeerNodeAddress() != null)
if (trade.getTradingPeer().getNodeAddress() != null)
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("tradeDetailsWindow.tradingPeersOnion"),
trade.getTradingPeerNodeAddress().getFullAddress());
trade.getTradingPeer().getNodeAddress().getFullAddress());
if (showXmrProofResult) {
// As the window is already overloaded we replace the tradingPeersPubKeyHash field with the auto-conf state

2
desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
View file

@ -501,7 +501,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
if (!empty && item != null && item.getTradable() instanceof Trade) {
Trade tradeModel = (Trade) item.getTradable();
int numPastTrades = item.getNumPastTrades();
NodeAddress tradingPeerNodeAddress = tradeModel.getTradingPeerNodeAddress();
NodeAddress tradingPeerNodeAddress = tradeModel.getTradingPeer().getNodeAddress();
String role = Res.get("peerInfoIcon.tooltip.tradePeer");
Node peerInfoIcon = new PeerInfoIconTrading(tradingPeerNodeAddress,
role,

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -522,7 +522,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
// If no dispute state set we start with mediation
resultHandler = () -> navigation.navigateTo(MainView.class, SupportView.class, MediationClientView.class);
disputeManager = mediationManager;
PubKeyRing arbitratorPubKeyRing = trade.getArbitratorPubKeyRing();
PubKeyRing arbitratorPubKeyRing = trade.getArbitrator().getPubKeyRing();
checkNotNull(arbitratorPubKeyRing, "arbitratorPubKeyRing must not be null");
byte[] depositTxSerialized = null; // depositTx.bitcoinSerialize(); // TODO (woodser): no serialized txs in xmr
Dispute dispute = new Dispute(new Date().getTime(),

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
View file

@ -849,7 +849,7 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
super.updateItem(newItem, empty);
if (!empty && newItem != null) {
final Trade trade = newItem.getTrade();
final NodeAddress tradingPeerNodeAddress = trade.getTradingPeerNodeAddress();
final NodeAddress tradingPeerNodeAddress = trade.getTradingPeer().getNodeAddress();
int numPastTrades = model.getNumPastTrades(trade);
String role = Res.get("peerInfoIcon.tooltip.tradePeer");
Node peerInfoIcon = new PeerInfoIconTrading(tradingPeerNodeAddress,

6
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View file

@ -372,9 +372,9 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
.filter(e -> {
if (e instanceof Trade) {
Trade t = (Trade) e;
return t.getTradingPeerNodeAddress() != null &&
trade.getTradingPeerNodeAddress() != null &&
t.getTradingPeerNodeAddress().getFullAddress().equals(trade.getTradingPeerNodeAddress().getFullAddress());
return t.getTradingPeer().getNodeAddress() != null &&
trade.getTradingPeer().getNodeAddress() != null &&
t.getTradingPeer().getNodeAddress().getFullAddress().equals(trade.getTradingPeer().getNodeAddress().getFullAddress());
} else
return false;