Refactorings, add decryption to crypt test at startup

This commit is contained in:
Manfred Karrer 2016-03-16 23:59:08 +01:00
parent 8037c33e79
commit 6721131ccf
9 changed files with 30 additions and 19 deletions

View file

@ -32,12 +32,13 @@ public final class DepositTxPublishedMessage extends TradeMessage implements Mai
public final byte[] depositTx;
private final NodeAddress senderNodeAddress;
private final String uid = UUID.randomUUID().toString();
private final String uid;
public DepositTxPublishedMessage(String tradeId, byte[] depositTx, NodeAddress senderNodeAddress) {
super(tradeId);
this.depositTx = depositTx;
this.senderNodeAddress = senderNodeAddress;
uid = UUID.randomUUID().toString();
}
@Override

View file

@ -31,12 +31,13 @@ public final class FiatTransferStartedMessage extends TradeMessage implements Ma
public final String buyerPayoutAddress;
private final NodeAddress senderNodeAddress;
private final String uid = UUID.randomUUID().toString();
private final String uid;
public FiatTransferStartedMessage(String tradeId, String buyerPayoutAddress, NodeAddress senderNodeAddress) {
super(tradeId);
this.buyerPayoutAddress = buyerPayoutAddress;
this.senderNodeAddress = senderNodeAddress;
uid = UUID.randomUUID().toString();
}
@Override

View file

@ -34,7 +34,7 @@ public final class FinalizePayoutTxRequest extends TradeMessage implements Mailb
public final String sellerPayoutAddress;
public final long lockTimeAsBlockHeight;
private final NodeAddress senderNodeAddress;
private final String uid = UUID.randomUUID().toString();
private final String uid;
public FinalizePayoutTxRequest(String tradeId,
byte[] sellerSignature,
@ -46,6 +46,7 @@ public final class FinalizePayoutTxRequest extends TradeMessage implements Mailb
this.sellerPayoutAddress = sellerPayoutAddress;
this.lockTimeAsBlockHeight = lockTimeAsBlockHeight;
this.senderNodeAddress = senderNodeAddress;
uid = UUID.randomUUID().toString();
}
@Override

View file

@ -47,7 +47,7 @@ public final class PayDepositRequest extends TradeMessage implements MailboxMess
public final ArrayList<NodeAddress> acceptedArbitratorNodeAddresses;
public final NodeAddress arbitratorNodeAddress;
private final NodeAddress senderNodeAddress;
private final String uid = UUID.randomUUID().toString();
private final String uid;
public PayDepositRequest(NodeAddress senderNodeAddress,
String tradeId,
@ -77,6 +77,7 @@ public final class PayDepositRequest extends TradeMessage implements MailboxMess
this.takeOfferFeeTxId = takeOfferFeeTxId;
this.acceptedArbitratorNodeAddresses = acceptedArbitratorNodeAddresses;
this.arbitratorNodeAddress = arbitratorNodeAddress;
uid = UUID.randomUUID().toString();
}
@Override

View file

@ -32,12 +32,13 @@ public final class PayoutTxFinalizedMessage extends TradeMessage implements Mail
public final byte[] payoutTx;
private final NodeAddress senderNodeAddress;
private final String uid = UUID.randomUUID().toString();
private final String uid;
public PayoutTxFinalizedMessage(String tradeId, byte[] payoutTx, NodeAddress senderNodeAddress) {
super(tradeId);
this.payoutTx = payoutTx;
this.senderNodeAddress = senderNodeAddress;
uid = UUID.randomUUID().toString();
}
@Override