Merge branch 'refs/heads/develop' into feature/CORE-525

Author: Ed Gamble

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

@@ -160,11 +160,11 @@ public void testAmountCreateEth() {
         assertTrue(a4.doubleAmount(ether_eth).isPresent());
         assertEquals(new Double(123.12345678), a4.doubleAmount(gwei_eth).get());
 
-        Amount a5 = Amount.create( "1.234567891234567891", false, ether_eth).get();
-        assertEquals(new Double(1234567891234567891L), a5.doubleAmount(wei_eth).get());
-        // 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 a5 = Amount.create( "1.234567891234567936", false, ether_eth).get();
+        assertEquals(new Double(1234567891234567936L), a5.doubleAmount(wei_eth).get());
+        assertEquals("1234567891234567936", a5.toStringWithBase(10, ""));
+        // TODO(discuss): The swift behaviour diverges here (rounds to ..."568,000:); does that matter?
+        assertEquals("wei1,234,567,891,234,567,940", a5.toStringAsUnit(wei_eth, null).get());
 
         Amount a6 = Amount.create("1", false, ether_eth).get();
         assertEquals("1000000000000000000", a6.toStringWithBase(10, ""));
@@ -178,10 +178,7 @@ public void testAmountCreateEth() {
 
         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);

Java/CoreCrypto/src/main/java/com/breadwallet/corecrypto/System.java

@@ -281,9 +281,12 @@ static void wipeAll(String storagePath, List<com.breadwallet.crypto.System> exem
         }
 
         File storageFile = new File(storagePath);
-        for (File child : storageFile.listFiles()) {
-            if (!exemptSystemPath.contains(child.getAbsolutePath())) {
-                deleteRecursively(child);
+        File[] childFiles = storageFile.listFiles();
+        if (null != childFiles) {
+            for (File child : childFiles) {
+                if (!exemptSystemPath.contains(child.getAbsolutePath())) {
+                    deleteRecursively(child);
+                }
             }
         }
     }

Java/Crypto/src/main/java/com/breadwallet/crypto/System.java

@@ -100,10 +100,13 @@ static void wipe(System system) {
 
     /**
      * Remove (aka 'wipe') the persistent storage associated with any and all systems located
-     * within `atPath` except for a specified array of systems to preserve.  Generally, this
+     * within `storagePath` except for a specified array of systems to preserve.  Generally, this
      * function should be called on startup after all systems have been created.  When called at
      * that time, any 'left over' systems will have their persistent storeage wiped.
      *
+     * Note: This function will perform no action if `storagePath` does not exist or is
+     *       not a directory.
+     *
      * @param storagePath the file system path where system data is persistently stored
      * @param exemptSystems the list of systems that should not have their data wiped.
      */

Swift/BRCrypto/BRCryptoSystem.swift

@@ -1008,7 +1008,10 @@ public final class System {
     /// Remove (aka 'wipe') the persistent storage associated with any and all systems located
     /// within `atPath` except for a specified array of systems to preserve.  Generally, this
     /// function should be called on startup after all systems have been created.  When called at
-    ///  that time, any 'left over' systems will have their persistent storeage wiped.
+    /// that time, any 'left over' systems will have their persistent storeage wiped.
+    ///
+    /// - Note: This function will perform no action if `atPath` does not exist or is
+    ///         not a directory.
     ///
     /// - Parameter atPath: the file system path where system data is persistently stored
     /// - Parameter systems: the array of systems that shouldn not have their data wiped.

Swift/BRCryptoTests/BRCryptoAmountTests.swift

@@ -225,6 +225,7 @@ class BRCryptoAmountTests: XCTestCase {
         }
 
     func testAmountETH () {
+        var result: String! = nil
         let eth = Currency (uids: "Ethereum", name: "Ethereum", code: "ETH", type: "native", issuer: nil)
 
         let ETH_WEI  = BRCrypto.Unit (currency: eth, uids: "ETH-WEI", name: "WEI",   symbol: "wei")
@@ -251,36 +252,39 @@ class BRCryptoAmountTests: XCTestCase {
         XCTAssertNotNil(a4!.double (as: ETH_GWEI))
         XCTAssertEqual(123.12345678, a4!.double (as: ETH_GWEI)!)
 
-
-        let a5 = Amount.create(string: "1.234567891234567891", negative: false, unit: ETH_ETHER)
+        // Avoid a 'exact double' representation error:
+        //    was 1.234567891234567891, now: 1.234567891234567936
+        let a5 = Amount.create(string: "1.234567891234567936", negative: false, unit: ETH_ETHER)
         XCTAssertNotNil(a5)
         XCTAssertNotNil (a5?.double(as: ETH_WEI))
-        XCTAssertEqual(1234567891234567891, a5?.double(as: ETH_WEI)!)
+        XCTAssertEqual(1234567891234567936, a5?.double(as: ETH_WEI)!)
+        XCTAssertEqual("1234567891234567936", a5?.string (base: 10, preface: ""))
         // Lost precision - last 5 digits
-        if #available(iOS 13, *) {
-            XCTAssertEqual("wei 1,234,567,891,234,568,000", a5?.string(as: ETH_WEI)!)
-        }
-        else {
-            XCTAssertEqual("wei1,234,567,891,234,570,000", a5?.string(as: ETH_WEI)!)
-        }
+        if #available(iOS 13, *) { result = "wei 1,234,567,891,234,568,000" }
+        else { result = "wei1,234,567,891,234,570,000" }
+        XCTAssertEqual(result, a5?.string(as: ETH_WEI)!)
 
-        XCTAssertEqual("1234567891234567891", a5?.string (base: 10, preface: ""))
         XCTAssertEqual("1000000000000000000", Amount.create(string: "1", negative: false, unit: ETH_ETHER)!.string (base: 10, preface: ""))
         // String (1000000000000000000, radix:16, uppercase: true) -> DE0B6B3A7640000
         XCTAssertEqual("0xDE0B6B3A7640000".lowercased(), Amount.create(string: "1", negative: false, unit: ETH_ETHER)!.string (base: 16, preface: "0x"))
 
         let a6 = Amount.create(string: "123000000000000000000.0", negative: false, unit: ETH_WEI)
         XCTAssertNotNil(a6)
-        XCTAssertEqual("wei123,000,000,000,000,000,000", a6?.string(as: ETH_WEI)!)
+        if #available(iOS 13, *) { result = "wei 123,000,000,000,000,000,000" }
+        else { result = "wei123,000,000,000,000,000,000" }
+        XCTAssertEqual(result, a6?.string(as: ETH_WEI)!)
 
         let a6Double = a6?.double (as: ETH_WEI)
         XCTAssertEqual(a6Double, 1.23e20)
 
         let a7 = Amount.create(string: "123456789012345678.0", negative: false, unit: ETH_WEI)
         XCTAssertNotNil(a7)
         XCTAssertEqual   ("123456789012345678",         a7?.string(base: 10, preface: ""))
-        XCTAssertEqual   ("wei123,456,789,012,346,000", a7?.string(as: ETH_WEI)!)
-        XCTAssertNotEqual("wei123,456,789,012,345,678", a7?.string(as: ETH_WEI)!)
+        // Note: a DIFFERENT VALUE between iOS 13
+        if #available(iOS 13, *) { result = "wei 123,456,789,012,345,680" }
+        else { result = "wei123,456,789,012,346,000" }
+        XCTAssertEqual   (result, a7?.string(as: ETH_WEI)!)
+//        XCTAssertNotEqual("wei123,456,789,012,345,678", a7?.string(as: ETH_WEI)!)
 
         let a7Double = a7?.double(as: ETH_WEI)
         XCTAssertEqual(a7Double, 1.2345678901234568e17)

bitcoin/BRWalletManager.c

@@ -1816,9 +1816,24 @@ _BRWalletManagerSyncEvent(void * context,
         }
         case SYNC_MANAGER_SET_PEERS: {
             // filesystem changes are NOT queued; they are acted upon immediately
-            fileServiceReplace (bwm->fileService, fileServiceTypePeers,
-                                (const void **) event.u.peers.peers,
-                                event.u.peers.count);
+            if (0 == event.u.peers.count) {
+                // no peers to set, just do a clear
+                fileServiceClear (bwm->fileService, fileServiceTypePeers);
+            } else {
+                // fileServiceReplace expects an array of pointers to entities, instead of an array of
+                // structures so let's do the conversion here
+                BRPeer **peers = calloc (event.u.peers.count,
+                                         sizeof(BRPeer *));
+
+                for (size_t i = 0; i < event.u.peers.count; i++) {
+                    peers[i] = &event.u.peers.peers[i];
+                }
+
+                fileServiceReplace (bwm->fileService, fileServiceTypePeers,
+                                    (const void **) peers,
+                                    event.u.peers.count);
+                free (peers);
+            }
             break;
         }
         case SYNC_MANAGER_ADD_PEERS: {

bitcoin/test.c

@@ -2464,7 +2464,7 @@ int BRWalletTests()
     if (BRWalletBalance(w) != SATOSHIS)
         r = 0, fprintf(stderr, "***FAILED*** %s: BRWalletNew() test\n", __func__);
 
-    if (BRWalletAllAddrs(w, NULL, 0) != SEQUENCE_GAP_LIMIT_EXTERNAL + SEQUENCE_GAP_LIMIT_INTERNAL + 1)
+    if (BRWalletAllAddrs(w, NULL, 0) != SEQUENCE_GAP_LIMIT_EXTERNAL_EXTENDED + SEQUENCE_GAP_LIMIT_INTERNAL_EXTENDED + 1)
         r = 0, fprintf(stderr, "***FAILED*** %s: BRWalletAllAddrs() test\n", __func__);
 
     UInt256 hash = tx->txHash;