Merge branch 'develop' into bugfix/CORE-629

Author: michael-brd

Java/CoreCrypto/build.gradle

@@ -28,6 +28,14 @@ android {
             minifyEnabled false
         }
     }
+
+    lintOptions {
+        quiet false
+        explainIssues true
+        abortOnError true
+        ignoreWarnings false
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {

Java/CoreCrypto/src/androidTest/java/com/breadwallet/corecrypto/AccountAIT.java

@@ -26,6 +26,9 @@ public void testAccountCreateFromPhrase() {
 
         Account account = Account.createFromPhrase(phrase, timestamp, uids);
         assertEquals(timestamp.getTime(), account.getTimestamp().getTime());
+
+        // check the uids matches the one provided on creation
+        assertEquals(uids, account.getUids());
     }
 
     @Test
@@ -56,6 +59,9 @@ public void testAccountSerialization() {
         // check that validity is transitive
         accountFromPhrase.validate(serializationFromSerialization);
         accountFromSerialization.validate(serializationFromPhrase);
+
+        // check the uids matches the one provided on creation
+        assertEquals(uids, accountFromSerialization.getUids());
     }
 
     @Test

Java/CoreCrypto/src/androidTest/java/com/breadwallet/corecrypto/AmountAIT.java

@@ -162,13 +162,29 @@ public void testAmountCreateEth() {
 
         Amount a5 = Amount.create( "1.234567891234567891", false, ether_eth).get();
         assertEquals(new Double(1234567891234567891L), a5.doubleAmount(wei_eth).get());
-        // TODO: The swift behaviour diverges here; how do we want to handle?
+        // TODO(discuss): The swift behaviour diverges here; how do we want to handle?
         // assertEquals("wei1,234,567,891,234,570,000", a5.toStringAsUnit(wei_eth, null).get());
         assertEquals("1234567891234567891", a5.toStringWithBase(10, ""));
 
         Amount a6 = Amount.create("1", false, ether_eth).get();
         assertEquals("1000000000000000000", a6.toStringWithBase(10, ""));
         assertEquals("0xDE0B6B3A7640000".toLowerCase(), a6.toStringWithBase(16, "0x"));
+
+        Amount a7 = Amount.create("123000000000000000000.0", false, wei_eth).get();
+        assertEquals("wei123,000,000,000,000,000,000", a7.toStringAsUnit(wei_eth).get());
+
+        double a7Double = a7.doubleAmount(wei_eth).get();
+        assertEquals(1.23e20, a7Double, 0.0);
+
+        Amount a8 = Amount.create("123456789012345678.0", false, wei_eth).get();
+        assertEquals("123456789012345678", a8.toStringWithBase(10, ""));
+        // TODO(discuss): The swift behaviour diverges here; how do we want to handle?
+        // assertEquals("wei123,456,789,012,345,600", a8.toStringAsUnit(wei_eth).get());
+        assertEquals("wei123,456,789,012,345,680", a8.toStringAsUnit(wei_eth).get());
+        assertNotEquals("wei123,456,789,012,345,678", a8.toStringAsUnit(wei_eth).get());
+
+        double a8Double = a8.doubleAmount(wei_eth).get();
+        assertEquals(1.2345678901234568e17, a8Double, 0.0);
     }
 
     @Test

Java/CoreCrypto/src/androidTest/java/com/breadwallet/corecrypto/CurrencyAIT.java

@@ -7,7 +7,6 @@
  */
 package com.breadwallet.corecrypto;
 
-import com.breadwallet.crypto.CryptoApi;
 import com.breadwallet.crypto.CurrencyPair;
 import com.google.common.base.Optional;
 import com.google.common.primitives.UnsignedInteger;
@@ -20,11 +19,7 @@ public class CurrencyAIT {
 
     @Before
     public void setup() {
-        try {
-            CryptoApi.initialize(CryptoApiProvider.getInstance());
-        }  catch (IllegalStateException e) {
-            // already initialized, ignore
-        }
+        HelpersAIT.registerCryptoApiProvider();
     }
 
     @Test

Java/CoreCrypto/src/androidTest/java/com/breadwallet/corecrypto/HelpersAIT.java

@@ -10,13 +10,15 @@
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 
+import com.breadwallet.crypto.CryptoApi;
 import com.breadwallet.crypto.Network;
 import com.breadwallet.crypto.System;
 import com.breadwallet.crypto.Transfer;
 import com.breadwallet.crypto.Wallet;
 import com.breadwallet.crypto.WalletManager;
 import com.breadwallet.crypto.blockchaindb.BlockchainDb;
 import com.breadwallet.crypto.events.network.NetworkEvent;
+import com.breadwallet.crypto.events.system.DefaultSystemListener;
 import com.breadwallet.crypto.events.system.SystemEvent;
 import com.breadwallet.crypto.events.system.SystemListener;
 import com.breadwallet.crypto.events.system.SystemManagerAddedEvent;
@@ -78,13 +80,39 @@ static boolean deleteFile(File file) {
         return file.delete();
     }
 
+    // Module
+
+    /* package */
+    static void registerCryptoApiProvider() {
+        try {
+            CryptoApi.initialize(CryptoApiProvider.getInstance());
+        }  catch (IllegalStateException e) {
+            // already initialized, ignore
+        }
+    }
+
     // System
 
     /* package */
-    static System createAndConfigureSystem(File dataDir, SystemListener listener) {
+    static System createAndConfigureSystem(File dataDir) {
+        String storagePath = dataDir.getAbsolutePath();
+        Account account = HelpersAIT.createDefaultAccount();
+        SystemListener listener = new DefaultSystemListener() {};
+        BlockchainDb query = HelpersAIT.createDefaultBlockchainDbWithToken();
+        ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+        com.breadwallet.corecrypto.System system = com.breadwallet.corecrypto.System.create(executor, listener, account, false, storagePath, query);
+
+        system.configure(Collections.emptyList());
+        Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS);
+
+        return system;
+    }
+
+    /* package */
+    static System createAndConfigureSystemWithListener(File dataDir, SystemListener listener) {
         String storagePath = dataDir.getAbsolutePath();
         Account account = HelpersAIT.createDefaultAccount();
-        BlockchainDb query = HelpersAIT.createDefaultBlockchainDb();
+        BlockchainDb query = HelpersAIT.createDefaultBlockchainDbWithToken();
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         com.breadwallet.corecrypto.System system = com.breadwallet.corecrypto.System.create(executor, listener, account, false, storagePath, query);
 
@@ -94,6 +122,20 @@ static System createAndConfigureSystem(File dataDir, SystemListener listener) {
         return system;
     }
 
+    /* package */
+    static System createAndConfigureSystemWithBlockchainDbAndCurrencies(File dataDir, BlockchainDb query, List<com.breadwallet.crypto.blockchaindb.models.bdb.Currency> currencies) {
+        String storagePath = dataDir.getAbsolutePath();
+        Account account = HelpersAIT.createDefaultAccount();
+        SystemListener listener = new DefaultSystemListener() {};
+        ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+        com.breadwallet.corecrypto.System system = com.breadwallet.corecrypto.System.create(executor, listener, account, false, storagePath, query);
+
+        system.configure(currencies);
+        Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS);
+
+        return system;
+    }
+
     /* package */
     static Optional<Network> getNetworkByCurrencyCode(Collection<Network> networks, String code) {
         Network out = null;
@@ -146,18 +188,25 @@ static Account createDefaultAccount() {
 
     // BlockchainDB
 
-    private static final OkHttpClient DEFAULT_HTTP_CLIENT = new OkHttpClient();
+    /* package */
+    static final OkHttpClient DEFAULT_HTTP_CLIENT = new OkHttpClient();
 
-    private static String DEFAULT_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9." +
-            "eyJzdWIiOiJkZWI2M2UyOC0wMzQ1LTQ4ZjYtOWQxNy1jZTgwY2JkNjE3Y2IiLCJicmQ" +
-            "6Y3QiOiJjbGkiLCJleHAiOjkyMjMzNzIwMzY4NTQ3NzUsImlhdCI6MTU2Njg2MzY0OX0." +
-            "FvLLDUSk1p7iFLJfg2kA-vwhDWTDulVjdj8YpFgnlE62OBFCYt4b3KeTND_qAhLynLKbGJ1UDpMMihsxtfvA0A";
+    private static String DEFAULT_TOKEN = "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9." +
+            "eyJzdWIiOiJjNzQ5NTA2ZS02MWUzLTRjM2UtYWNiNS00OTY5NTM2ZmRhMTAiLCJpYXQiOjE1N" +
+            "zI1NDY1MDAuODg3LCJleHAiOjE4ODAxMzA1MDAuODg3LCJicmQ6Y3QiOiJ1c3IiLCJicmQ6Y2" +
+            "xpIjoiZGViNjNlMjgtMDM0NS00OGY2LTlkMTctY2U4MGNiZDYxN2NiIn0." +
+            "460_GdAWbONxqOhWL5TEbQ7uEZi3fSNrl0E_Zg7MAg570CVcgO7rSMJvAPwaQtvIx1XFK_QZjcoNULmB8EtOdg";
 
     /* package */
-    static BlockchainDb createDefaultBlockchainDb() {
+    static BlockchainDb createDefaultBlockchainDbWithToken() {
         return BlockchainDb.createForTest(DEFAULT_HTTP_CLIENT, DEFAULT_TOKEN);
     }
 
+    /* package */
+    static BlockchainDb createDefaultBlockchainDbWithoutToken() {
+        return new BlockchainDb(DEFAULT_HTTP_CLIENT);
+    }
+
     // Listeners
 
     /* package */