diff --git a/src/deploy/package/shortcut-32@2x.png b/src/deploy/package/shortcut-32@2x.png deleted file mode 100644 index 6a20746931..0000000000 Binary files a/src/deploy/package/shortcut-32@2x.png and /dev/null differ diff --git a/src/main/java/io/bitsquare/SeedNode.java b/src/main/java/io/bitsquare/SeedNode.java index 73be31f708..a28056f95b 100644 --- a/src/main/java/io/bitsquare/SeedNode.java +++ b/src/main/java/io/bitsquare/SeedNode.java @@ -48,10 +48,10 @@ public class SeedNode extends Thread { private static final List staticSedNodeAddresses = SeedNodeAddress .StaticSeedNodeAddresses.getAllSeedNodeAddresses(); - public static void mainForTest(String[] args) { - Peer peer = null; + + public static void main1(String[] args) { try { - peer = new PeerBuilder(Number160.createHash("digitalocean1.bitsquare.io")).ports(5000).start(); + Peer peer = new PeerBuilder(Number160.createHash("digitalocean1.bitsquare.io")).ports(5000).start(); new PeerBuilderDHT(peer).start(); new PeerBuilderNAT(peer).start(); diff --git a/src/main/java/io/bitsquare/arbitrator/Arbitrator.java b/src/main/java/io/bitsquare/arbitrator/Arbitrator.java index 48ae03be9d..87d1bb1c20 100644 --- a/src/main/java/io/bitsquare/arbitrator/Arbitrator.java +++ b/src/main/java/io/bitsquare/arbitrator/Arbitrator.java @@ -17,6 +17,8 @@ package io.bitsquare.arbitrator; +import org.bitcoinj.core.Coin; + import java.io.Serializable; import java.util.List; @@ -33,11 +35,7 @@ public class Arbitrator implements Serializable { private ID_TYPE idType; private List languages; private Reputation reputation; - private double maxTradeVolume; - private double passiveServiceFee; - private double minPassiveServiceFee; - private double arbitrationFee; - private double minArbitrationFee; + private Coin fee; private List arbitrationMethods; private List idVerifications; @@ -54,11 +52,7 @@ public class Arbitrator implements Serializable { ID_TYPE idType, List languages, Reputation reputation, - double maxTradeVolume, - double passiveServiceFee, - double minPassiveServiceFee, - double arbitrationFee, - double minArbitrationFee, + Coin fee, List arbitrationMethods, List idVerifications, String webUrl, @@ -69,11 +63,7 @@ public class Arbitrator implements Serializable { this.idType = idType; this.languages = languages; this.reputation = reputation; - this.maxTradeVolume = maxTradeVolume; - this.passiveServiceFee = passiveServiceFee; - this.minPassiveServiceFee = minPassiveServiceFee; - this.arbitrationFee = arbitrationFee; - this.minArbitrationFee = minArbitrationFee; + this.fee = fee; this.arbitrationMethods = arbitrationMethods; this.idVerifications = idVerifications; this.webUrl = webUrl; @@ -90,11 +80,7 @@ public class Arbitrator implements Serializable { this.idType = persistedArbitrator.getIdType(); this.languages = persistedArbitrator.getLanguages(); this.reputation = persistedArbitrator.getReputation(); - this.maxTradeVolume = persistedArbitrator.getMaxTradeVolume(); - this.passiveServiceFee = persistedArbitrator.getPassiveServiceFee(); - this.minPassiveServiceFee = persistedArbitrator.getMinPassiveServiceFee(); - this.arbitrationFee = persistedArbitrator.getArbitrationFee(); - this.minArbitrationFee = persistedArbitrator.getMinArbitrationFee(); + this.fee = persistedArbitrator.getFee(); this.arbitrationMethods = persistedArbitrator.getArbitrationMethods(); this.idVerifications = persistedArbitrator.getIdVerifications(); this.webUrl = persistedArbitrator.getWebUrl(); @@ -127,17 +113,14 @@ public class Arbitrator implements Serializable { return id != null && id.equals(other.getId()); } - public String getId() { return id; } - public String getPubKeyAsHex() { return pubKeyAsHex; } - public String getMessagePubKeyAsHex() { return messagePubKeyAsHex; } @@ -152,57 +135,34 @@ public class Arbitrator implements Serializable { return name; } - public ID_TYPE getIdType() { return idType; } - public List getLanguages() { return languages; } - public Reputation getReputation() { return reputation; } - public double getMaxTradeVolume() { - return maxTradeVolume; + public Coin getFee() { + return fee; } - public double getPassiveServiceFee() { - return passiveServiceFee; - } - - public double getMinPassiveServiceFee() { - return minPassiveServiceFee; - } - - public double getArbitrationFee() { - return arbitrationFee; - } - - public double getMinArbitrationFee() { - return minArbitrationFee; - } - - public List getArbitrationMethods() { return arbitrationMethods; } - public List getIdVerifications() { return idVerifications; } - public String getWebUrl() { return webUrl; } - public String getDescription() { return description; } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml index ceb85b3167..04484df0f5 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml @@ -43,7 +43,7 @@ GridPane.rowIndex="4"/>