shitload of tests and simplified testnet docker setup

Author: danielclasen

docker-compose.yml

@@ -4,57 +4,37 @@ services:
   iridiumd1:
     image: danielclasen/iridium-core
     entrypoint: /iridium/iridiumd
-    command: ["--testnet", "--hide-my-port", "--data-dir", "/data", "--rpc-bind-ip", "0.0.0.0", "--add-exclusive-node", "iridiumd2:12007", "--add-exclusive-node", "iridiumd3:12007"]
+    command: ["--testnet", "--hide-my-port", "--data-dir", "/data", "--rpc-bind-ip", "0.0.0.0"]
     volumes:
       - ./src/test/resources/iridium/daemon1:/data
 
 
-  iridiumd2:
-    image: danielclasen/iridium-core
-    entrypoint: /iridium/iridiumd
-    command: ["--testnet", "--hide-my-port", "--data-dir", "/data", "--rpc-bind-ip", "0.0.0.0", "--add-exclusive-node", "iridiumd1:12007", "--add-exclusive-node", "iridiumd3:12007"]
-    links:
-      - iridiumd1
-      - iridiumd3
-    volumes:
-      - ./src/test/resources/iridium/daemon2:/data
-
-  iridiumd3:
-    image: danielclasen/iridium-core
-    entrypoint: /iridium/iridiumd
-    command: ["--testnet", "--hide-my-port", "--data-dir", "/data", "--rpc-bind-ip", "0.0.0.0", "--add-exclusive-node", "iridiumd1:12007", "--add-exclusive-node", "iridiumd2:12007"]
-    links:
-      - iridiumd1
-    volumes:
-      - ./src/test/resources/iridium/daemon3:/data
-
   walletd-gen1:
     image: danielclasen/iridium-walletd-gen
-    command: ["--testnet", "--data-dir", "/data", "-w", "/data/wallet", "-p", "password", "-g", "--daemon-address", "iridiumd2",]
+    command: ["--testnet", "--data-dir", "/data", "-w", "/data/wallet", "-p", "password", "-g", "--daemon-address", "iridiumd1",]
     volumes:
       - ./src/test/resources/iridium/wallet1:/data
     links:
-      - iridiumd2
+      - iridiumd1
 
   walletd1:
     image: danielclasen/iridium-core
     entrypoint: /iridium/iridium_walletd
-    command: ["--testnet", "--data-dir", "/data", "-w", "/data/wallet", "-p", "password", "--daemon-address", "iridiumd2", "--log-level", "2"]
+    command: ["--testnet", "--data-dir", "/data", "-w", "/data/wallet", "-p", "password", "--daemon-address", "iridiumd1", "--log-level", "2"]
     restart: on-failure
     volumes:
-      - /dev/random:/dev/random
-      - /dev/urandom:/dev/urandom
       - ./src/test/resources/iridium/wallet1:/data
     links:
       - walletd-gen1
-      - iridiumd2
+      - iridiumd1
     ports:
       - 14008:14007
 
 
   miner1:
     image: danielclasen/iridium-testminer
-    command: ["--daemon-host", "iridiumd2", "--threads", "1", "--log-level", "2"]
+    command: ["--daemon-host", "iridiumd1", "--threads", "1", "--log-level", "2"]
+    restart: on-failure
     links:
       - walletd1
     volumes:
@@ -63,10 +43,11 @@ services:
   miner2:
     image: danielclasen/iridium-testminer
     command: ["--daemon-host", "iridiumd1", "--threads", "1", "--log-level", "2"]
+    restart: on-failure
     links:
-      - walletd2
+      - walletd1
     volumes:
-      - ./src/test/resources/iridium/wallet2:/data
+      - ./src/test/resources/iridium/wallet1:/data
 
 
   walletd-gen2:

src/main/java/cash/ird/walletd/IridiumAPI.java

@@ -10,6 +10,8 @@
 
 public interface IridiumAPI {
 
+    String RPC_VERSION = "2.0";
+
     boolean reset() throws IridiumWalletdException;
 
     boolean reset(String viewSecretKey) throws IridiumWalletdException;
@@ -72,15 +74,11 @@ public interface IridiumAPI {
 
     String sendTransaction(List<Transfer> transfers, long fee, int anonymity, String changeAddress, List<String> addresses, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException;
 
-    String sendTransaction(List<Transfer> transfers, long fee, int anonymity, List<String> addresses, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException;
-
     String sendTransaction(List<Transfer> transfers, long fee, int anonymity, String address, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException;
 
 
     String createDelayedTransaction(List<Transfer> transfers, long fee, int anonymity, String changeAddress, List<String> addresses, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException;
 
-    String createDelayedTransaction(List<Transfer> transfers, long fee, int anonymity, List<String> addresses, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException;
-
     String createDelayedTransaction(List<Transfer> transfers, long fee, int anonymity, String address, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException;
 
 
@@ -97,8 +95,6 @@ public interface IridiumAPI {
 
     String sendFusionTransaction(long threshold, int anonymity, String address) throws IridiumWalletdException;
 
-    String sendFusionTransaction(long threshold, int anonymity) throws IridiumWalletdException;
-
 
     EstimatedFusion estimateFusion(long threshold, List<String> addresses) throws IridiumWalletdException;
 

src/main/java/cash/ird/walletd/IridiumClient.java

@@ -9,6 +9,7 @@
 import cash.ird.walletd.rpc.WalletdClient;
 import cash.ird.walletd.rpc.exception.IridiumWalletdException;
 import cash.ird.walletd.rpc.method.RequestMethod;
+import lombok.NonNull;
 
 import java.util.*;
 
@@ -24,7 +25,7 @@ public IridiumClient() {
         this("localhost", 14007);
     }
 
-    public IridiumClient(String host, int port) {
+    public IridiumClient(@NonNull String host, @NonNull int port) {
         this(String.format("%s://%s:%s/%s", DEFAULT_PROTOCOL, host, port, DEFAULT_PATH));
     }
 
@@ -241,11 +242,6 @@ public String sendTransaction(List<Transfer> transfers, long fee, int anonymity,
     }
 
 
-    @Override
-    public String sendTransaction(List<Transfer> transfers, long fee, int anonymity, List<String> addresses, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException {
-        return this.sendTransaction(transfers, fee, anonymity, null, addresses, extra, unlockTime, paymentId);
-    }
-
     @Override
     public String sendTransaction(List<Transfer> transfers, long fee, int anonymity, String address, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException {
         return this.sendTransaction(transfers, fee, anonymity, null, Collections.singletonList(address), extra, unlockTime, paymentId);
@@ -257,11 +253,6 @@ public String createDelayedTransaction(List<Transfer> transfers, long fee, int a
         return this.walletdClient.doRequest(RequestMethod.CREATE_DELAYED_TRANSACTION, Collections.unmodifiableMap(params), TransactionHashResponse.class);
     }
 
-    @Override
-    public String createDelayedTransaction(List<Transfer> transfers, long fee, int anonymity, List<String> addresses, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException {
-        return this.createDelayedTransaction(transfers, fee, anonymity, null, addresses, extra, unlockTime, paymentId);
-    }
-
     @Override
     public String createDelayedTransaction(List<Transfer> transfers, long fee, int anonymity, String address, String extra, Long unlockTime, String paymentId) throws IridiumWalletdException {
         return this.createDelayedTransaction(transfers, fee, anonymity, null, Collections.singletonList(address), extra, unlockTime, paymentId);
@@ -333,11 +324,6 @@ public String sendFusionTransaction(long threshold, int anonymity, String addres
         return this.sendFusionTransaction(threshold, anonymity, Collections.singletonList(address), null);
     }
 
-    @Override
-    public String sendFusionTransaction(long threshold, int anonymity) throws IridiumWalletdException {
-        return this.sendFusionTransaction(threshold, anonymity, null, null);
-    }
-
 
     @Override
     public EstimatedFusion estimateFusion(long threshold, List<String> addresses) throws IridiumWalletdException {

src/main/java/cash/ird/walletd/model/request/Key.java

@@ -1,13 +1,12 @@
 package cash.ird.walletd.model.request;
 
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-@Data
 @EqualsAndHashCode
 public abstract class Key {
 
-    protected String value;
+    public abstract String getValue();
+    public abstract void setValue(String value);
 
     public abstract boolean isPrivate();
 

src/main/java/cash/ird/walletd/model/request/PrivateKey.java

@@ -1,20 +1,15 @@
 package cash.ird.walletd.model.request;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@RequiredArgsConstructor(staticName = "of")
 public class PrivateKey extends Key {
 
-    public PrivateKey(String value){
-        this.value = value;
-    }
-
-    public static PrivateKey of(String value){
-        return new PrivateKey(value);
-    }
+    @NonNull
+    private String value;
 
     @Override
     public boolean isPrivate() {

src/main/java/cash/ird/walletd/model/request/PublicKey.java

@@ -1,19 +1,15 @@
 package cash.ird.walletd.model.request;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@RequiredArgsConstructor(staticName = "of")
 public class PublicKey extends Key {
 
-    public PublicKey(String value){
-        this.value = value;
-    }
-
-    public static PublicKey of(String value){
-        return new PublicKey(value);
-    }
+    @NonNull
+    private String value;
 
     @Override
     public boolean isPrivate() {

src/main/java/cash/ird/walletd/model/request/WalletdRequest.java

@@ -1,20 +1,23 @@
 package cash.ird.walletd.model.request;
 
+import cash.ird.walletd.IridiumAPI;
 import cash.ird.walletd.rpc.method.RequestMethod;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 import java.util.Map;
 import java.util.UUID;
 
-@RequiredArgsConstructor(staticName = "of")
 @Data
-public class WalletdRequest{
+@RequiredArgsConstructor(staticName = "of")
+@NoArgsConstructor
+public class WalletdRequest {
 
-    private String jsonrpc = "2.0";
+    private final String jsonrpc = IridiumAPI.RPC_VERSION;
 
-    private String id = UUID.randomUUID().toString();
+    private final String id = UUID.randomUUID().toString();
 
     @NonNull
     private RequestMethod method;

src/main/java/cash/ird/walletd/model/response/AddressListResponse.java

@@ -1,9 +1,13 @@
 package cash.ird.walletd.model.response;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class AddressListResponse extends WrappedWalletdResponse<AddressListResponse,List<String>> {
 
     @JsonSetter("addresses")

src/main/java/cash/ird/walletd/model/response/AddressResponse.java

@@ -1,7 +1,11 @@
 package cash.ird.walletd.model.response;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class AddressResponse extends WrappedWalletdResponse<AddressResponse,String> {
 
     @JsonSetter("address")

src/main/java/cash/ird/walletd/model/response/BlockHashListResponse.java

@@ -1,9 +1,13 @@
 package cash.ird.walletd.model.response;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class BlockHashListResponse extends WrappedWalletdResponse<BlockHashListResponse,List<String>> {
 
     @JsonSetter("blockHashes")

src/main/java/cash/ird/walletd/model/response/SimpleWalletdResponse.java

@@ -5,7 +5,7 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SimpleWalletdResponse<T> extends AbstractWalletdResponse<T,T> {
+public abstract class SimpleWalletdResponse<T> extends AbstractWalletdResponse<T,T> {
 
     @Override
     public T unwrap() {

src/main/java/cash/ird/walletd/model/response/TransactionHashBagListResponse.java

@@ -2,9 +2,13 @@
 
 import cash.ird.walletd.model.body.TransactionHashBag;
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TransactionHashBagListResponse extends WrappedWalletdResponse<TransactionHashBagListResponse,List<TransactionHashBag>> {
 
     @JsonSetter("items")

src/main/java/cash/ird/walletd/model/response/TransactionHashListResponse.java

@@ -1,9 +1,13 @@
 package cash.ird.walletd.model.response;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TransactionHashListResponse extends WrappedWalletdResponse<TransactionHashListResponse,List<String>> {
 
     @JsonSetter("transactionHashes")

src/main/java/cash/ird/walletd/model/response/TransactionHashResponse.java

@@ -1,7 +1,11 @@
 package cash.ird.walletd.model.response;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TransactionHashResponse extends WrappedWalletdResponse<TransactionHashResponse,String> {
 
     @JsonSetter("transactionHash")

src/main/java/cash/ird/walletd/model/response/TransactionItemBagListResponse.java

@@ -2,9 +2,13 @@
 
 import cash.ird.walletd.model.body.TransactionItemBag;
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TransactionItemBagListResponse extends WrappedWalletdResponse<TransactionItemBagListResponse,List<TransactionItemBag>> {
 
     @JsonSetter("items")

src/main/java/cash/ird/walletd/model/response/TransactionResponse.java

@@ -2,7 +2,11 @@
 
 import cash.ird.walletd.model.body.Transaction;
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TransactionResponse extends WrappedWalletdResponse<TransactionResponse,Transaction> {
 
     @JsonSetter("transaction")

src/main/java/cash/ird/walletd/model/response/ViewKeyResponse.java

@@ -1,7 +1,11 @@
 package cash.ird.walletd.model.response;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class ViewKeyResponse extends WrappedWalletdResponse<ViewKeyResponse,String> {
 
     @JsonSetter("viewSecretKey")