Merge remote-tracking branch 'origin/master' into reticulum

src/test/java/org/qortal/test/apps/SyncReport.java

@@ -180,8 +180,7 @@ public class SyncReport {
 
 				// Sync went bad
 				syncEvent = null;
-				continue;
-			}
+            }
 		}
 
 		for (SyncEvent se : syncEvents) {

src/test/java/org/qortal/test/arbitrary/ArbitraryDataFileTests.java

@@ -21,6 +21,7 @@ public class ArbitraryDataFileTests extends Common {
 	public void testSplitAndJoin() throws DataException {
 		String dummyDataString = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 		ArbitraryDataFile arbitraryDataFile = new ArbitraryDataFile(dummyDataString.getBytes(), null, false);
+		arbitraryDataFile.save();
 		assertTrue(arbitraryDataFile.exists());
 		assertEquals(62, arbitraryDataFile.size());
 		assertEquals("3eyjYjturyVe61grRX42bprGr3Cvw6ehTy4iknVnosDj", arbitraryDataFile.digest58());
@@ -51,6 +52,7 @@ public class ArbitraryDataFileTests extends Common {
 		new Random().nextBytes(randomData); // No need for SecureRandom here
 
 		ArbitraryDataFile arbitraryDataFile = new ArbitraryDataFile(randomData, null, false);
+		arbitraryDataFile.save();
 		assertTrue(arbitraryDataFile.exists());
 		assertEquals(fileSize, arbitraryDataFile.size());
 		String originalFileDigest = arbitraryDataFile.digest58();

src/test/java/org/qortal/test/at/CrowdfundTests.java

@@ -7,7 +7,6 @@ import org.junit.Test;
 import org.qortal.account.Account;
 import org.qortal.account.PrivateKeyAccount;
 import org.qortal.asset.Asset;
-import org.qortal.at.AT;
 import org.qortal.block.Block;
 import org.qortal.data.at.ATData;
 import org.qortal.data.at.ATStateData;

src/test/java/org/qortal/test/crosschain/BitcoinTests.java

@@ -1,7 +1,5 @@
 package org.qortal.test.crosschain;
 
-import org.junit.Ignore;
-import org.junit.Test;
 import org.qortal.crosschain.Bitcoin;
 import org.qortal.crosschain.Bitcoiny;
 

src/test/java/org/qortal/test/crosschain/PirateChainTests.java

@@ -11,7 +11,6 @@ import org.qortal.crypto.Crypto;
 import org.qortal.transform.TransformationException;
 
 import java.util.List;
-import java.util.Set;
 
 import static org.junit.Assert.*;
 import static org.qortal.crosschain.BitcoinyHTLC.Status.*;