Merge branch 'danielclasen:master' into master

Author: steevebrush

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

@@ -81,7 +81,7 @@ public interface IridiumAPI {
     String createAddress() throws IridiumWalletdException;
 
     /**
-     * Create a new address on the current wallet container with either a {@link cash.ird.walletd.model.request.PrivateKey} or {@link cash.ird.walletd.model.request.PublicKey}
+     * Imports an existing address on the current wallet container with either a {@link cash.ird.walletd.model.request.PrivateKey} or {@link cash.ird.walletd.model.request.PublicKey}
      *
      * @return the new address
      * @throws IridiumWalletdException in case of an RPC Error

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

@@ -6,6 +6,7 @@
 import cash.ird.walletd.model.request.BlockRange;
 import cash.ird.walletd.model.request.Key;
 import cash.ird.walletd.model.response.*;
+import cash.ird.walletd.rpc.HttpClient;
 import cash.ird.walletd.rpc.WalletdClient;
 import cash.ird.walletd.rpc.exception.IridiumWalletdException;
 import cash.ird.walletd.rpc.method.RequestMethod;
@@ -33,6 +34,10 @@ public IridiumClient(String url) {
         this.walletdClient = new WalletdClient(url);
     }
 
+    public IridiumClient(String url, HttpClient httpClient) {
+        this.walletdClient = new WalletdClient(url, httpClient);
+    }
+
     @Override
     public boolean reset() throws IridiumWalletdException {
         return this.walletdClient.doRequest(RequestMethod.RESET, NoopResponse.class) != null;
@@ -87,9 +92,9 @@ public String createAddress(Key key) throws IridiumWalletdException {
         if (key != null) {
             Map<String, Object> params = buildParams();
             if (key.isPrivate()) {
-                params.put("secretSpendKey", key.getValue());
+                params.put("spendSecretKey", key.getValue());
             } else {
-                params.put("publicSpendKey", key.getValue());
+                params.put("spendPublicKey", key.getValue());
             }
 
             return this.walletdClient.doRequest(RequestMethod.CREATE_ADDRESS, Collections.unmodifiableMap(params), AddressResponse.class);

src/test/groovy/cash/ird/walletd/IridiumClientTest.groovy

@@ -33,14 +33,19 @@ class IridiumClientTest extends Specification {
         wallet1 = getClass().getResource("/iridium/wallet1/wallet.adr").readLines().first()
 
         sut2 = new IridiumClient("localhost", 14009)
-        wallet2 = getClass().getResource("/iridium/wallet2/wallet.adr").readLines().first()
 
         waitForBalance(sut, wallet1, 1)
-//        waitForBalance(sut2, wallet2, 0)
         waitForBlockHeightTotal(sut, 10)
         waitForBlockHeightTotal(sut2, 10)
     }
 
+    void setup() {
+        wallet2 = sut2.createAddress()
+
+        def status = sut.getStatus()
+        waitForBlockHeightTotal(sut2, status.getBlockCount().toInteger())
+    }
+
     void cleanupSpec() {
         sut.reset()
         sut2.reset()
@@ -139,6 +144,7 @@ class IridiumClientTest extends Specification {
         address != null
     }
 
+    @Ignore("ignored until we figure out how that is working in the core")
     def "CreateAddress with publicKey"() {
         when:
         String address = sut.createAddress(PublicKey.of("test123"))
@@ -147,12 +153,25 @@ class IridiumClientTest extends Specification {
         address != null
     }
 
-    def "CreateAddress with privateKey"() {
+    def "Import wallet from viewSecretKey and spendSecretKey"() {
+        given:
+        def testAddress = sut.createAddress()
+        def keyPair = sut.getSpendKeys(testAddress)
+        def viewKey = sut.getViewKey()
+
+
         when:
-        String address = sut.createAddress(PrivateKey.of("secr3t"))
+        sut2.reset(viewKey)
+        String address = sut2.createAddress(PrivateKey.of(keyPair.getSecretKey()))
 
         then:
-        address != null
+        address == testAddress
+
+        when:
+        def addresses = sut2.getAddresses()
+
+        then:
+        addresses.size() == 1
     }
 
     def "DeleteAddress"() {
@@ -520,14 +539,14 @@ class IridiumClientTest extends Specification {
     private static void waitForBalance(IridiumAPI api, String address, long threshold) {
         while (api.getBalance(address).availableBalance < threshold) {
             log.info("Waiting for valid balance >=$threshold on wallet $address...")
-            sleep(1000)
+            sleep(5000)
         }
     }
 
     private static void waitForTransactionConfirmation(IridiumAPI api, String transactionHash) {
         while (api.getUnconfirmedTransactionHashes().contains(transactionHash)) {
             log.info("Waiting for tx $transactionHash to get confirmed...")
-            sleep(1000)
+            sleep(5000)
         }
     }
 
@@ -536,15 +555,15 @@ class IridiumClientTest extends Specification {
         def currentHeight
         while ((currentHeight = api.getStatus().knownBlockCount) && currentHeight < desiredHeight) {
             log.info("Waiting for blockHeight>$desiredHeight, current blockHeight=$currentHeight...")
-            sleep(1000)
+            sleep(5000)
         }
     }
 
     private static void waitForBlockHeightTotal(IridiumAPI api, int desiredHeight) {
         def currentHeight
         while ((currentHeight = api.getStatus().knownBlockCount) && currentHeight < desiredHeight) {
             log.info("Waiting for blockHeight>$desiredHeight, current blockHeight=$currentHeight...")
-            sleep(1000)
+            sleep(5000)
         }
     }