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

Fix wrong package

Browse source
This commit is contained in:
Manfred Karrer 2015-03-17 23:03:49 +01:00
parent 276bbb2219
commit ac886c1c94
6 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java
View file

@ -28,11 +28,13 @@ import io.bitsquare.user.User;
import org.bitcoinj.core.Transaction;
import java.io.Serializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BuyerAsOffererModel extends OfferSharedModel {
public class BuyerAsOffererModel extends OfferSharedModel implements Serializable {
private static final long serialVersionUID = 5000457153390911569L;
private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererModel.class);
private final Trade trade;
@ -42,11 +44,6 @@ public class BuyerAsOffererModel extends OfferSharedModel {
private Transaction publishedDepositTx;
private String takeOfferFeeTxId;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
public BuyerAsOffererModel(Trade trade,
TradeMessageService tradeMessageService,
WalletService walletService,

6
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java
View file

@ -24,9 +24,13 @@ import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import java.io.Serializable;
import java.util.List;
public class OffererModel {
public class OffererModel implements Serializable {
private static final long serialVersionUID = -1845177552607819927L;
public byte[] pubKey;
public ECKey.ECDSASignature payoutSignature;
public Coin payoutAmount;

6
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java
View file

@ -24,11 +24,15 @@ import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import java.io.Serializable;
import java.security.PublicKey;
import java.util.List;
public class TakerModel {
public class TakerModel implements Serializable{
private static final long serialVersionUID = 2660909397210346486L;
public Peer peer;
public String accountId;
public FiatAccount fiatAccount;

6
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java
View file

@ -23,9 +23,13 @@ import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.TransactionOutput;
import java.io.Serializable;
import java.util.List;
public class OffererModel {
public class OffererModel implements Serializable {
private static final long serialVersionUID = 1582902150121576205L;
public OffererModel(Peer peer) {
this.peer = peer;
}

6
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java
View file

@ -25,15 +25,17 @@ import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeMessageService;
import io.bitsquare.trade.protocol.trade.OfferSharedModel;
import io.bitsquare.trade.protocol.trade.offerer.models.TakerModel;
import io.bitsquare.user.User;
import org.bitcoinj.core.Transaction;
import java.io.Serializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SellerAsTakerModel extends OfferSharedModel {
public class SellerAsTakerModel extends OfferSharedModel implements Serializable {
private static final long serialVersionUID = -963501132927618376L;
private static final Logger log = LoggerFactory.getLogger(SellerAsTakerModel.class);
private final Trade trade;

8
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java
View file

@ -23,15 +23,19 @@ import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import java.io.Serializable;
import java.util.List;
class TakerModel {
public class TakerModel implements Serializable {
private static final long serialVersionUID = -4041809885931756860L;
public List<TransactionOutput> connectedOutputsForAllInputs;
public List<TransactionOutput> outputs;
public Transaction depositTx;
public FiatAccount fiatAccount;
public String accountId;
public Coin payoutAmount;
public byte[] pubKey;
}