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

Rename offererMultiSigPubKey to offererBtcPubKey (as well as wellers side) to not break serialized data

Browse source
This commit is contained in:
Manfred Karrer 2017-03-22 13:31:45 -05:00
parent 6733c064b9
commit adbb547eb1
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/src/main/java/io/bitsquare/trade/Contract.java
View file

@ -61,9 +61,9 @@ public final class Contract implements Payload {
private final String offererPayoutAddressString;
private final String takerPayoutAddressString;
@JsonExclude
private final byte[] offererMultiSigPubKey;
private final byte[] offererBtcPubKey;
@JsonExclude
private final byte[] takerMultiSigPubKey;
private final byte[] takerBtcPubKey;
public Contract(Offer offer,
Coin tradeAmount,
@ -81,8 +81,8 @@ public final class Contract implements Payload {
PubKeyRing takerPubKeyRing,
String offererPayoutAddressString,
String takerPayoutAddressString,
byte[] offererMultiSigPubKey,
byte[] takerMultiSigPubKey) {
byte[] offererBtcPubKey,
byte[] takerBtcPubKey) {
this.offer = offer;
this.tradePrice = tradePrice.value;
this.buyerNodeAddress = buyerNodeAddress;
@ -99,8 +99,8 @@ public final class Contract implements Payload {
this.takerPubKeyRing = takerPubKeyRing;
this.offererPayoutAddressString = offererPayoutAddressString;
this.takerPayoutAddressString = takerPayoutAddressString;
this.offererMultiSigPubKey = offererMultiSigPubKey;
this.takerMultiSigPubKey = takerMultiSigPubKey;
this.offererBtcPubKey = offererBtcPubKey;
this.takerBtcPubKey = takerBtcPubKey;
}
public boolean isBuyerOffererAndSellerTaker() {
@ -133,11 +133,11 @@ public final class Contract implements Payload {
}
public byte[] getBuyerMultiSigPubKey() {
return isBuyerOffererAndSellerTaker ? offererMultiSigPubKey : takerMultiSigPubKey;
return isBuyerOffererAndSellerTaker ? offererBtcPubKey : takerBtcPubKey;
}
public byte[] getSellerMultiSigPubKey() {
return isBuyerOffererAndSellerTaker ? takerMultiSigPubKey : offererMultiSigPubKey;
return isBuyerOffererAndSellerTaker ? takerBtcPubKey : offererBtcPubKey;
}
public PaymentAccountContractData getBuyerPaymentAccountContractData() {
@ -207,8 +207,8 @@ public final class Contract implements Payload {
return false;
if (takerPayoutAddressString != null ? !takerPayoutAddressString.equals(contract.takerPayoutAddressString) : contract.takerPayoutAddressString != null)
return false;
if (!Arrays.equals(offererMultiSigPubKey, contract.offererMultiSigPubKey)) return false;
return Arrays.equals(takerMultiSigPubKey, contract.takerMultiSigPubKey);
if (!Arrays.equals(offererBtcPubKey, contract.offererBtcPubKey)) return false;
return Arrays.equals(takerBtcPubKey, contract.takerBtcPubKey);
}
@ -230,8 +230,8 @@ public final class Contract implements Payload {
result = 31 * result + (sellerNodeAddress != null ? sellerNodeAddress.hashCode() : 0);
result = 31 * result + (offererPayoutAddressString != null ? offererPayoutAddressString.hashCode() : 0);
result = 31 * result + (takerPayoutAddressString != null ? takerPayoutAddressString.hashCode() : 0);
result = 31 * result + (offererMultiSigPubKey != null ? Arrays.hashCode(offererMultiSigPubKey) : 0);
result = 31 * result + (takerMultiSigPubKey != null ? Arrays.hashCode(takerMultiSigPubKey) : 0);
result = 31 * result + (offererBtcPubKey != null ? Arrays.hashCode(offererBtcPubKey) : 0);
result = 31 * result + (takerBtcPubKey != null ? Arrays.hashCode(takerBtcPubKey) : 0);
return result;
}
@ -254,8 +254,8 @@ public final class Contract implements Payload {
"\n\tsellerAddress=" + sellerNodeAddress +
"\n\toffererPayoutAddressString='" + offererPayoutAddressString + '\'' +
"\n\ttakerPayoutAddressString='" + takerPayoutAddressString + '\'' +
"\n\toffererMultiSigPubKey=" + Utils.HEX.encode(offererMultiSigPubKey) +
"\n\ttakerMultiSigPubKey=" + Utils.HEX.encode(takerMultiSigPubKey) +
"\n\toffererMultiSigPubKey=" + Utils.HEX.encode(offererBtcPubKey) +
"\n\ttakerMultiSigPubKey=" + Utils.HEX.encode(takerBtcPubKey) +
"\n\tBuyerMultiSigPubKey=" + Utils.HEX.encode(getBuyerMultiSigPubKey()) +
"\n\tSellerMultiSigPubKey=" + Utils.HEX.encode(getSellerMultiSigPubKey()) +
'}';