Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize imports

Browse Source
This commit is contained in:
AlphaX-Projects
2023-11-04 17:11:07 +01:00
parent dfcc7bb370
commit 3190fed3b9
517 changed files with 2232 additions and 2876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/test/java/org/qortal/test/AccountBalanceTests.java
View File

@@ -1,14 +1,5 @@
package org.qortal.test;
import static org.junit.Assert.*;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -17,14 +8,24 @@ import org.qortal.account.PublicKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.data.account.AccountData;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class AccountBalanceTests extends Common {
@Before

10
src/test/java/org/qortal/test/AccountRefCacheTests.java
View File

@@ -1,10 +1,5 @@
package org.qortal.test;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Random;
import org.junit.Before;
import org.junit.Test;
import org.qortal.account.Account;
@@ -21,6 +16,11 @@ import org.qortal.test.common.TestAccount;
import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import java.util.Arrays;
import java.util.Random;
import static org.junit.Assert.*;
public class AccountRefCacheTests extends Common {
private static final Random RANDOM = new Random();

4
src/test/java/org/qortal/test/AmountsTests.java
View File

@@ -1,10 +1,10 @@
package org.qortal.test;
import static org.junit.Assert.*;
import org.junit.Test;
import org.qortal.utils.Amounts;
import static org.junit.Assert.assertEquals;
public class AmountsTests {
@Test

14
src/test/java/org/qortal/test/BlockTests.java
View File

@@ -1,18 +1,11 @@
package org.qortal.test;
import java.util.Arrays;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.Block;
import org.qortal.block.GenesisBlock;
import org.qortal.data.at.ATStateData;
import org.qortal.data.block.BlockData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
@@ -28,7 +21,12 @@ import org.qortal.transform.block.BlockTransformation;
import org.qortal.transform.block.BlockTransformer;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import org.qortal.utils.Triple;
import java.util.Arrays;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
import static org.junit.Assert.*;

14
src/test/java/org/qortal/test/ByteArrayTests.java
View File

@@ -1,19 +1,13 @@
package org.qortal.test;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.TreeMap;
import org.junit.Before;
import org.junit.Test;
import org.qortal.utils.ByteArray;
import java.util.*;
import static org.junit.Assert.*;
public class ByteArrayTests {
private static List<byte[]> testValues;

24
src/test/java/org/qortal/test/ChainWeightTests.java
View File

@@ -1,14 +1,8 @@
package org.qortal.test;
import static org.junit.Assert.*;
import java.math.BigInteger;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.qortal.account.Account;
import org.qortal.block.Block;
import org.qortal.block.BlockChain;
@@ -21,9 +15,15 @@ import org.qortal.test.common.TestAccount;
import org.qortal.transform.Transformer;
import org.qortal.transform.block.BlockTransformer;
import org.qortal.utils.NTP;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import java.math.BigInteger;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import static org.junit.Assert.*;
public class ChainWeightTests extends Common {

27
src/test/java/org/qortal/test/CryptoTests.java
View File

@@ -1,16 +1,24 @@
package org.qortal.test;
import com.google.common.hash.HashCode;
import org.bouncycastle.crypto.agreement.X25519Agreement;
import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
import org.bouncycastle.crypto.params.X25519PrivateKeyParameters;
import org.bouncycastle.crypto.params.X25519PublicKeyParameters;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.crypto.AES;
import org.qortal.crypto.Qortal25519Extras;
import org.qortal.crypto.Crypto;
import org.qortal.crypto.Qortal25519Extras;
import org.qortal.test.common.Common;
import org.qortal.utils.Base58;
import static org.junit.Assert.*;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -25,18 +33,7 @@ import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Random;
import org.bouncycastle.crypto.agreement.X25519Agreement;
import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
import org.bouncycastle.crypto.params.X25519PrivateKeyParameters;
import org.bouncycastle.crypto.params.X25519PublicKeyParameters;
import com.google.common.hash.HashCode;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import static org.junit.Assert.*;
public class CryptoTests extends Common {

8
src/test/java/org/qortal/test/EPCTests.java
View File

@@ -1,5 +1,9 @@
package org.qortal.test;
import org.junit.Test;
import org.qortal.utils.ExecuteProduceConsume;
import org.qortal.utils.ExecuteProduceConsume.StatsSnapshot;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -9,10 +13,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.qortal.utils.ExecuteProduceConsume;
import org.qortal.utils.ExecuteProduceConsume.StatsSnapshot;
import static org.junit.Assert.fail;
public class EPCTests {

4
src/test/java/org/qortal/test/GuiTests.java
View File

@@ -1,12 +1,12 @@
package org.qortal.test;
import java.awt.TrayIcon.MessageType;
import org.junit.Ignore;
import org.junit.Test;
import org.qortal.gui.SplashFrame;
import org.qortal.gui.SysTray;
import java.awt.TrayIcon.MessageType;
@Ignore
public class GuiTests {

4
src/test/java/org/qortal/test/MemoryPoWTests.java
View File

@@ -6,10 +6,10 @@ import org.qortal.crypto.MemoryPoW;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
import static org.junit.Assert.*;
import java.util.Random;
import static org.junit.Assert.*;
@Ignore
public class MemoryPoWTests {

4
src/test/java/org/qortal/test/MessageTests.java
View File

@@ -27,11 +27,11 @@ import org.qortal.transform.transaction.MessageTransactionTransformer;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.NTP;
import static org.junit.Assert.*;
import java.util.List;
import java.util.Random;
import static org.junit.Assert.*;
public class MessageTests extends Common {
private static final int version = 4;

7
src/test/java/org/qortal/test/RepositoryTests.java
View File

@@ -1,5 +1,7 @@
package org.qortal.test;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.qortal.account.Account;
@@ -17,8 +19,6 @@ import org.qortal.repository.hsqldb.HSQLDBRepository;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import static org.junit.Assert.*;
import java.lang.reflect.Field;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -29,8 +29,7 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import static org.junit.Assert.*;
public class RepositoryTests extends Common {

3
src/test/java/org/qortal/test/SchnorrTests.java
View File

@@ -12,9 +12,8 @@ import org.qortal.test.common.AccountUtils;
import org.qortal.transform.Transformer;
import java.math.BigInteger;
import java.security.SecureRandom;
import java.security.Security;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
import static org.junit.Assert.*;

12
src/test/java/org/qortal/test/SelfSponsorshipAlgoV1Tests.java
View File

@@ -15,17 +15,23 @@ import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.settings.Settings;
import org.qortal.test.common.*;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.TransferPrivsTransaction;
import org.qortal.utils.NTP;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import static org.junit.Assert.*;
import static org.qortal.test.common.AccountUtils.fee;
import static org.qortal.transaction.Transaction.ValidationResult.*;
import static org.qortal.transaction.Transaction.ValidationResult.ACCOUNT_NOT_TRANSFERABLE;
import static org.qortal.transaction.Transaction.ValidationResult.OK;
public class SelfSponsorshipAlgoV1Tests extends Common {

8
src/test/java/org/qortal/test/TransactionSearchTests.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test;
import static org.junit.Assert.*;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
@@ -15,6 +11,10 @@ import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.transaction.Transaction.TransactionType;
import java.util.List;
import static org.junit.Assert.assertEquals;
public class TransactionSearchTests extends Common {
@Before

10
src/test/java/org/qortal/test/TransferPrivsTests.java
View File

@@ -17,20 +17,16 @@ import org.qortal.data.transaction.TransferPrivsTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.*;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transform.Transformer;
import org.qortal.utils.Amounts;
import static org.junit.Assert.*;
import java.util.List;
import java.util.Random;
import static org.junit.Assert.*;
@Ignore(value = "Doesn't work, to be fixed later")
public class TransferPrivsTests extends Common {

7
src/test/java/org/qortal/test/UnicodeTests.java
View File

@@ -1,11 +1,12 @@
package org.qortal.test;
import static org.junit.Assert.*;
import static org.qortal.utils.Unicode.*;
import org.junit.Test;
import org.qortal.utils.Unicode;
import static org.junit.Assert.*;
import static org.qortal.utils.Unicode.NO_BREAK_SPACE;
import static org.qortal.utils.Unicode.ZERO_WIDTH_SPACE;
public class UnicodeTests {
@Test

8
src/test/java/org/qortal/test/api/AddressesApiTests.java
View File

@@ -1,15 +1,15 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import java.util.Collections;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.qortal.api.resource.AddressesResource;
import org.qortal.test.common.ApiCommon;
import java.util.Collections;
import static org.junit.Assert.assertNotNull;
public class AddressesApiTests extends ApiCommon {
private AddressesResource addressesResource;

4
src/test/java/org/qortal/test/api/AdminApiTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.junit.Before;
import org.junit.Test;
@@ -11,6 +9,8 @@ import org.qortal.settings.Settings;
import org.qortal.test.common.ApiCommon;
import org.qortal.test.common.Common;
import static org.junit.Assert.assertNotNull;
public class AdminApiTests extends ApiCommon {
private AdminResource adminResource;

4
src/test/java/org/qortal/test/api/ArbitraryApiTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.qortal.api.resource.ArbitraryResource;
@@ -9,6 +7,8 @@ import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.arbitrary.misc.Service;
import org.qortal.test.common.ApiCommon;
import static org.junit.Assert.assertNotNull;
public class ArbitraryApiTests extends ApiCommon {
private ArbitraryResource arbitraryResource;

17
src/test/java/org/qortal/test/api/AssetsApiTests.java
View File

@@ -1,24 +1,25 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qortal.api.ApiError;
import org.qortal.api.ApiException;
import org.qortal.api.resource.AssetsResource;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.ApiCommon;
import org.qortal.test.common.AssetUtils;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class AssetsApiTests extends ApiCommon {
private static final String FAKE_ORDER_ID_BASE58 = "C3CPq7c8PY";

12
src/test/java/org/qortal/test/api/BlockApiTests.java
View File

@@ -1,11 +1,5 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -21,6 +15,12 @@ import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.utils.Base58;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertNotNull;
public class BlockApiTests extends ApiCommon {
private BlocksResource blocksResource;

4
src/test/java/org/qortal/test/api/GroupApiTests.java
View File

@@ -1,12 +1,12 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.qortal.api.resource.GroupsResource;
import org.qortal.test.common.ApiCommon;
import static org.junit.Assert.assertNotNull;
public class GroupApiTests extends ApiCommon {
private GroupsResource groupsResource;

5
src/test/java/org/qortal/test/api/NamesApiTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
@@ -17,7 +15,8 @@ import org.qortal.test.common.Common;
import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.RegisterNameTransaction;
import org.qortal.utils.NTP;
import static org.junit.Assert.assertNotNull;
public class NamesApiTests extends ApiCommon {

10
src/test/java/org/qortal/test/api/TransactionsApiTests.java
View File

@@ -1,10 +1,5 @@
package org.qortal.test.api;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qortal.api.resource.TransactionsResource;
@@ -12,6 +7,11 @@ import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.test.common.ApiCommon;
import org.qortal.transaction.Transaction.TransactionType;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.assertNotNull;
public class TransactionsApiTests extends ApiCommon {
private TransactionsResource transactionsResource;

21
src/test/java/org/qortal/test/apps/BuildCheckpoints.java
View File

@@ -1,25 +1,16 @@
package org.qortal.test.apps;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import org.bitcoinj.core.*;
import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.store.BlockStore;
import org.bitcoinj.store.MemoryBlockStore;
import java.io.*;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.TreeMap;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.core.CheckpointManager;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.PeerAddress;
import org.bitcoinj.core.PeerGroup;
import org.bitcoinj.core.StoredBlock;
import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.store.BlockStore;
import org.bitcoinj.store.MemoryBlockStore;
public class BuildCheckpoints {
private static final TreeMap<Integer, StoredBlock> checkpoints = new TreeMap<>();

8
src/test/java/org/qortal/test/apps/CheckTranslations.java
View File

@@ -1,15 +1,15 @@
package org.qortal.test.apps;
import org.qortal.api.ApiError;
import org.qortal.globalization.Translator;
import org.qortal.transaction.Transaction.ValidationResult;
import java.util.Arrays;
import java.util.Collections;
import java.util.Locale;
import java.util.Set;
import java.util.stream.Collectors;
import org.qortal.api.ApiError;
import org.qortal.globalization.Translator;
import org.qortal.transaction.Transaction.ValidationResult;
public class CheckTranslations {
private static final String[] SUPPORTED_LANGS = new String[] { "en", "de", "zh", "ru" };

7
src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java
View File

@@ -1,8 +1,6 @@
package org.qortal.test.apps;
import java.math.BigDecimal;
import java.security.Security;
import io.druid.extendedset.intset.ConciseSet;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qortal.block.BlockChain;
@@ -19,7 +17,8 @@ import org.qortal.transform.block.BlockTransformer;
import org.qortal.utils.Base58;
import org.roaringbitmap.IntIterator;
import io.druid.extendedset.intset.ConciseSet;
import java.math.BigDecimal;
import java.security.Security;
public class DecodeOnlineAccounts {

4
src/test/java/org/qortal/test/apps/MemoryPoWTest.java
View File

@@ -1,9 +1,9 @@
package org.qortal.test.apps;
import java.util.Random;
import org.qortal.crypto.MemoryPoW;
import java.util.Random;
public class MemoryPoWTest {
public static void main(String[] args) {

10
src/test/java/org/qortal/test/apps/NTPTests.java
View File

@@ -1,17 +1,17 @@
package org.qortal.test.apps;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.LoggerContext;
import org.qortal.utils.NTP;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class NTPTests {
private static final List<String> CC_TLDS = Arrays.asList("oceania", "europe", "cn", "asia", "africa");

13
src/test/java/org/qortal/test/apps/ProxyTest.java
View File

@@ -1,22 +1,13 @@
package org.qortal.test.apps;
import javax.net.ssl.*;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.URL;
import java.net.*;
import java.util.Collections;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SNIHostName;
import javax.net.ssl.SNIServerName;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSocket;
public class ProxyTest {
private static final Pattern proxyUrlPattern = Pattern.compile("(https://)([^@:/]+)@([0-9.]{7,15})(/.*)");

4
src/test/java/org/qortal/test/apps/RewardShareKeys.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.apps;
import java.security.Security;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qortal.account.PrivateKeyAccount;
@@ -9,6 +7,8 @@ import org.qortal.account.PublicKeyAccount;
import org.qortal.crypto.Crypto;
import org.qortal.utils.Base58;
import java.security.Security;
public class RewardShareKeys {
private static void usage() {

17
src/test/java/org/qortal/test/apps/SettingsTests.java
View File

@@ -1,20 +1,19 @@
package org.qortal.test.apps;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.qortal.block.BlockChain;
import org.qortal.data.transaction.TransactionData;
import org.qortal.settings.Settings;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
public class SettingsTests {
public static void main(String[] args) throws JAXBException, IOException {

7
src/test/java/org/qortal/test/apps/SyncReport.java
View File

@@ -8,12 +8,7 @@ import java.nio.file.Paths;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

13
src/test/java/org/qortal/test/apps/VanityGen.java
View File

@@ -1,18 +1,17 @@
package org.qortal.test.apps;
import java.security.SecureRandom;
import java.security.Security;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import com.google.common.primitives.Bytes;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.crypto.Crypto;
import org.qortal.utils.Base58;
import com.google.common.primitives.Bytes;
import java.security.SecureRandom;
import java.security.Security;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class VanityGen {

2
src/test/java/org/qortal/test/apps/brokenmd160.java
View File

@@ -1,7 +1,7 @@
package org.qortal.test.apps;
import org.qortal.crypto.BrokenMD160;
import com.google.common.hash.HashCode;
import org.qortal.crypto.BrokenMD160;
@SuppressWarnings("deprecation")
public class brokenmd160 {

3
src/test/java/org/qortal/test/apps/orphan.java
View File

@@ -1,5 +1,4 @@
package org.qortal.test.apps;
import java.security.Security;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.qortal.block.BlockChain;
@@ -10,6 +9,8 @@ import org.qortal.repository.RepositoryManager;
import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qortal.settings.Settings;
import java.security.Security;
public class orphan {
public static void main(String[] args) {

3
src/test/java/org/qortal/test/arbitrary/ArbitraryDataDigestTests.java
View File

@@ -13,7 +13,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.UUID;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class ArbitraryDataDigestTests extends Common {

2
src/test/java/org/qortal/test/arbitrary/ArbitraryDataFileTests.java
View File

@@ -2,8 +2,8 @@ package org.qortal.test.arbitrary;
import org.junit.Before;
import org.junit.Test;
import org.qortal.repository.DataException;
import org.qortal.arbitrary.ArbitraryDataFile;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
import java.util.Random;

1
src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
View File

@@ -23,7 +23,6 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.RegisterNameTransaction;
import org.qortal.utils.Base58;
import org.qortal.utils.NTP;
import java.io.IOException;
import java.nio.file.Path;

5
src/test/java/org/qortal/test/arbitrary/ArbitraryDataTests.java
View File

@@ -6,14 +6,14 @@ import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.arbitrary.ArbitraryDataDigest;
import org.qortal.arbitrary.ArbitraryDataFile;
import org.qortal.arbitrary.ArbitraryDataFile.*;
import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType;
import org.qortal.arbitrary.ArbitraryDataReader;
import org.qortal.arbitrary.exception.MissingDataException;
import org.qortal.arbitrary.metadata.ArbitraryDataMetadataPatch;
import org.qortal.arbitrary.misc.Service;
import org.qortal.controller.arbitrary.ArbitraryDataManager;
import org.qortal.crypto.Crypto;
import org.qortal.data.transaction.ArbitraryTransactionData.*;
import org.qortal.data.transaction.ArbitraryTransactionData.Method;
import org.qortal.data.transaction.RegisterNameTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
@@ -25,7 +25,6 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.RegisterNameTransaction;
import org.qortal.utils.Base58;
import org.qortal.utils.NTP;
import java.io.IOException;
import java.nio.file.Files;

2
src/test/java/org/qortal/test/arbitrary/ArbitraryEncryptionTests.java
View File

@@ -2,12 +2,10 @@ package org.qortal.test.arbitrary;
import org.junit.Before;
import org.junit.Test;
import org.qortal.arbitrary.ArbitraryDataDigest;
import org.qortal.crypto.AES;
import org.qortal.crypto.Crypto;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
import org.qortal.utils.ZipUtils;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;

2
src/test/java/org/qortal/test/arbitrary/ArbitraryTransactionMetadataTests.java
View File

@@ -6,7 +6,7 @@ import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.arbitrary.ArbitraryDataDigest;
import org.qortal.arbitrary.ArbitraryDataFile;
import org.qortal.arbitrary.ArbitraryDataFile.*;
import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType;
import org.qortal.arbitrary.ArbitraryDataReader;
import org.qortal.arbitrary.exception.MissingDataException;
import org.qortal.arbitrary.misc.Category;

8
src/test/java/org/qortal/test/assets/CancellingTests.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test.assets;
import static org.junit.Assert.*;
import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -17,6 +13,10 @@ import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.utils.Amounts;
import java.util.Map;
import static org.junit.Assert.assertEquals;
public class CancellingTests extends Common {
/*

8
src/test/java/org/qortal/test/assets/GranularityTests.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test.assets;
import static org.junit.Assert.assertEquals;
import java.math.BigDecimal;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -12,6 +8,10 @@ import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
import org.qortal.utils.Amounts;
import java.math.BigDecimal;
import static org.junit.Assert.assertEquals;
/** Check granularity adjustment values. */
public class GranularityTests extends Common {

5
src/test/java/org/qortal/test/assets/MiscTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.assets;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -18,6 +16,9 @@ import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.utils.Amounts;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class MiscTests extends Common {
@Before

4
src/test/java/org/qortal/test/assets/TradingTests.java
View File

@@ -12,10 +12,10 @@ import org.qortal.test.common.AssetUtils;
import org.qortal.test.common.Common;
import org.qortal.utils.Amounts;
import static org.junit.Assert.assertEquals;
import java.util.Map;
import static org.junit.Assert.assertEquals;
public class TradingTests extends Common {
@Before

8
src/test/java/org/qortal/test/at/AtRepositoryTests.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test.at;
import static org.junit.Assert.*;
import java.util.List;
import org.ciyam.at.MachineState;
import org.junit.Before;
import org.junit.Test;
@@ -18,6 +14,10 @@ import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.transaction.DeployAtTransaction;
import java.util.List;
import static org.junit.Assert.*;
public class AtRepositoryTests extends Common {
@Before

10
src/test/java/org/qortal/test/at/GetMessageLengthTests.java
View File

@@ -1,10 +1,5 @@
package org.qortal.test.at;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
import java.util.Random;
import org.ciyam.at.CompilationException;
import org.ciyam.at.FunctionCode;
import org.ciyam.at.MachineState;
@@ -31,6 +26,11 @@ import org.qortal.transaction.DeployAtTransaction;
import org.qortal.transaction.MessageTransaction;
import org.qortal.utils.BitTwiddling;
import java.nio.ByteBuffer;
import java.util.Random;
import static org.junit.Assert.assertEquals;
public class GetMessageLengthTests extends Common {
private static final Random RANDOM = new Random();

18
src/test/java/org/qortal/test/at/GetNextTransactionTests.java
View File

@@ -1,16 +1,6 @@
package org.qortal.test.at;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import org.ciyam.at.CompilationException;
import org.ciyam.at.FunctionCode;
import org.ciyam.at.MachineState;
import org.ciyam.at.OpCode;
import org.ciyam.at.Timestamp;
import org.ciyam.at.*;
import org.junit.Before;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
@@ -34,6 +24,12 @@ import org.qortal.transaction.MessageTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.utils.BitTwiddling;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
public class GetNextTransactionTests extends Common {
@Before

8
src/test/java/org/qortal/test/at/GetPartialMessageTests.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test.at;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
import org.ciyam.at.CompilationException;
import org.ciyam.at.FunctionCode;
import org.ciyam.at.MachineState;
@@ -28,6 +24,10 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.transaction.DeployAtTransaction;
import org.qortal.transaction.MessageTransaction;
import java.nio.ByteBuffer;
import static org.junit.Assert.assertArrayEquals;
public class GetPartialMessageTests extends Common {
@Before

18
src/test/java/org/qortal/test/at/SleepUntilMessageOrHeightTests.java
View File

@@ -1,16 +1,6 @@
package org.qortal.test.at;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import org.ciyam.at.CompilationException;
import org.ciyam.at.FunctionCode;
import org.ciyam.at.MachineState;
import org.ciyam.at.OpCode;
import org.ciyam.at.Timestamp;
import org.ciyam.at.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,6 +27,12 @@ import org.qortal.transaction.MessageTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.utils.BitTwiddling;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
public class SleepUntilMessageOrHeightTests extends Common {
private static final byte[] messageData = new byte[] { 0x44 };

18
src/test/java/org/qortal/test/at/SleepUntilMessageTests.java
View File

@@ -1,16 +1,6 @@
package org.qortal.test.at;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import org.ciyam.at.CompilationException;
import org.ciyam.at.FunctionCode;
import org.ciyam.at.MachineState;
import org.ciyam.at.OpCode;
import org.ciyam.at.Timestamp;
import org.ciyam.at.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,6 +27,12 @@ import org.qortal.transaction.MessageTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.utils.BitTwiddling;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
public class SleepUntilMessageTests extends Common {
private static final byte[] messageData = new byte[] { 0x44 };

12
src/test/java/org/qortal/test/common/AccountUtils.java
View File

@@ -1,11 +1,5 @@
package org.qortal.test.common;
import static org.junit.Assert.assertEquals;
import static org.qortal.crypto.Qortal25519Extras.signForAggregation;
import java.security.SecureRandom;
import java.util.*;
import com.google.common.primitives.Longs;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.crypto.Crypto;
@@ -22,6 +16,12 @@ import org.qortal.transaction.Transaction;
import org.qortal.transform.Transformer;
import org.qortal.utils.Amounts;
import java.security.SecureRandom;
import java.util.*;
import static org.junit.Assert.assertEquals;
import static org.qortal.crypto.Qortal25519Extras.signForAggregation;
public class AccountUtils {
public static final int txGroupId = Group.NO_GROUP;

9
src/test/java/org/qortal/test/common/ApiCommon.java
View File

@@ -1,15 +1,16 @@
package org.qortal.test.common;
import static org.junit.Assert.*;
import java.lang.reflect.Field;
import org.eclipse.jetty.server.Request;
import org.junit.Before;
import org.qortal.api.ApiError;
import org.qortal.api.ApiException;
import org.qortal.repository.DataException;
import java.lang.reflect.Field;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
public class ApiCommon extends Common {
public static final long MAX_API_RESPONSE_PERIOD = 2_000L; // ms

18
src/test/java/org/qortal/test/common/AssetUtils.java
View File

@@ -1,19 +1,8 @@
package org.qortal.test.common;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Base64;
import java.util.Base64.Encoder;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.asset.OrderData;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.CancelAssetOrderTransactionData;
import org.qortal.data.transaction.CreateAssetOrderTransactionData;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferAssetTransactionData;
import org.qortal.data.transaction.*;
import org.qortal.group.Group;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
@@ -21,9 +10,14 @@ import org.qortal.repository.RepositoryManager;
import org.qortal.transaction.Transaction;
import org.qortal.utils.Amounts;
import java.util.Base64;
import java.util.Base64.Encoder;
import java.util.Map;
import java.util.Random;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class AssetUtils {
public static final int txGroupId = Group.NO_GROUP;

35
src/test/java/org/qortal/test/common/Common.java
View File

@@ -1,24 +1,5 @@
package org.qortal.test.common;
import static org.junit.Assert.*;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.SecureRandom;
import java.security.Security;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -31,15 +12,29 @@ import org.qortal.block.BlockChain;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.data.asset.AssetData;
import org.qortal.data.group.GroupData;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryFactory;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qortal.settings.Settings;
import org.qortal.utils.NTP;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.SecureRandom;
import java.security.Security;
import java.util.*;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import static org.junit.Assert.*;
public class Common {
static {

4
src/test/java/org/qortal/test/common/FakePeer.java
View File

@@ -1,5 +1,7 @@
package org.qortal.test.common;
import org.qortal.network.message.Message;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -7,8 +9,6 @@ import java.util.Random;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.qortal.network.message.Message;
public abstract class FakePeer implements Runnable {
private static final long DEFAULT_BROADCAST_INTERVAL = 60 * 1000;

6
src/test/java/org/qortal/test/common/GroupUtils.java
View File

@@ -1,11 +1,7 @@
package org.qortal.test.common;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.CreateGroupTransactionData;
import org.qortal.data.transaction.GroupApprovalTransactionData;
import org.qortal.data.transaction.JoinGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.*;
import org.qortal.group.Group;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;

1
src/test/java/org/qortal/test/common/PeerMessage.java
View File

@@ -1,7 +1,6 @@
package org.qortal.test.common;
import org.qortal.network.message.Message;
import org.qortal.test.common.FakePeer;
public class PeerMessage {
public final FakePeer peer;

14
src/test/java/org/qortal/test/common/TransactionUtils.java
View File

@@ -1,12 +1,5 @@
package org.qortal.test.common;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
@@ -16,6 +9,13 @@ import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transaction.Transaction.ValidationResult;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class TransactionUtils {
/** Signs transaction using given account and attempts to import into unconfirmed pile, returning validation result. */

4
src/test/java/org/qortal/test/common/transaction/AccountLevelTestTransaction.java
View File

@@ -1,13 +1,13 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.AccountLevelTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import java.util.Random;
public class AccountLevelTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

8
src/test/java/org/qortal/test/common/transaction/ArbitraryTestTransaction.java
View File

@@ -1,19 +1,19 @@
package org.qortal.test.common.transaction;
import java.util.ArrayList;
import java.util.List;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.arbitrary.misc.Service;
import org.qortal.asset.Asset;
import org.qortal.data.PaymentData;
import org.qortal.data.transaction.ArbitraryTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.ArbitraryTransactionData.DataType;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.utils.Amounts;
import java.util.ArrayList;
import java.util.List;
public class ArbitraryTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

4
src/test/java/org/qortal/test/common/transaction/CancelAssetOrderTestTransaction.java
View File

@@ -1,13 +1,13 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CancelAssetOrderTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import java.util.Random;
public class CancelAssetOrderTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

4
src/test/java/org/qortal/test/common/transaction/CreateGroupTestTransaction.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CreateGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
@@ -9,6 +7,8 @@ import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import java.util.Random;
public class CreateGroupTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

8
src/test/java/org/qortal/test/common/transaction/CreatePollTestTransaction.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test.common.transaction;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CreatePollTransactionData;
import org.qortal.data.transaction.TransactionData;
@@ -11,6 +7,10 @@ import org.qortal.data.voting.PollOptionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class CreatePollTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

4
src/test/java/org/qortal/test/common/transaction/DeployAtTestTransaction.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.transaction.DeployAtTransactionData;
@@ -10,6 +8,8 @@ import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.utils.Amounts;
import java.util.Random;
public class DeployAtTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

4
src/test/java/org/qortal/test/common/transaction/GroupApprovalTestTransaction.java
View File

@@ -1,13 +1,13 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.GroupApprovalTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import java.util.Random;
public class GroupApprovalTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

4
src/test/java/org/qortal/test/common/transaction/IssueAssetTestTransaction.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
@@ -9,6 +7,8 @@ import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.test.common.AssetUtils;
import java.util.Random;
public class IssueAssetTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

6
src/test/java/org/qortal/test/common/transaction/MultiPaymentTestTransaction.java
View File

@@ -1,8 +1,5 @@
package org.qortal.test.common.transaction;
import java.util.ArrayList;
import java.util.List;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.PaymentData;
@@ -12,6 +9,9 @@ import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.utils.Amounts;
import java.util.ArrayList;
import java.util.List;
public class MultiPaymentTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

5
src/test/java/org/qortal/test/common/transaction/TestTransaction.java
View File

@@ -1,13 +1,12 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.group.Group;
import org.qortal.repository.DataException;
import org.qortal.utils.NTP;
import java.util.Random;
public abstract class TestTransaction {

4
src/test/java/org/qortal/test/common/transaction/VoteOnPollTestTransaction.java
View File

@@ -1,13 +1,13 @@
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.VoteOnPollTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import java.util.Random;
public class VoteOnPollTestTransaction extends TestTransaction {
public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {

21
src/test/java/org/qortal/test/crosschain/ElectrumXTests.java
View File

@@ -1,28 +1,23 @@
package org.qortal.test.crosschain;
import static org.junit.Assert.*;
import java.security.Security;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.Address;
import org.bitcoinj.params.TestNet3Params;
import org.bitcoinj.script.ScriptBuilder;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.junit.Test;
import org.qortal.crosschain.ForeignBlockchainException;
import org.qortal.crosschain.BitcoinyTransaction;
import org.qortal.crosschain.ElectrumX;
import org.qortal.crosschain.TransactionHash;
import org.qortal.crosschain.UnspentOutput;
import org.qortal.crosschain.Bitcoin.BitcoinNet;
import org.qortal.crosschain.*;
import org.qortal.crosschain.ElectrumX.Server.ConnectionType;
import org.qortal.utils.BitTwiddling;
import com.google.common.hash.HashCode;
import java.security.Security;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.*;
public class ElectrumXTests {

7
src/test/java/org/qortal/test/crosschain/HtlcTests.java
View File

@@ -1,20 +1,19 @@
package org.qortal.test.crosschain;
import static org.junit.Assert.*;
import com.google.common.primitives.Longs;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.qortal.crosschain.Bitcoin;
import org.qortal.crosschain.BitcoinyHTLC;
import org.qortal.crosschain.ForeignBlockchainException;
import org.qortal.crosschain.Litecoin;
import org.qortal.crypto.Crypto;
import org.qortal.crosschain.BitcoinyHTLC;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
import com.google.common.primitives.Longs;
import static org.junit.Assert.*;
public class HtlcTests extends Common {

2
src/test/java/org/qortal/test/crosschain/PirateChainTests.java
View File

@@ -1,6 +1,6 @@
package org.qortal.test.crosschain;
import cash.z.wallet.sdk.rpc.CompactFormats.*;
import cash.z.wallet.sdk.rpc.CompactFormats.CompactBlock;
import com.google.common.hash.HashCode;
import com.google.common.primitives.Bytes;
import org.junit.Ignore;

11
src/test/java/org/qortal/test/crosschain/apps/BuildHTLC.java
View File

@@ -1,19 +1,18 @@
package org.qortal.test.crosschain.apps;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.script.Script.ScriptType;
import org.qortal.crosschain.Litecoin;
import org.qortal.crosschain.Bitcoin;
import org.qortal.crosschain.Bitcoiny;
import org.qortal.crosschain.BitcoinyHTLC;
import org.qortal.crosschain.Litecoin;
import com.google.common.hash.HashCode;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
public class BuildHTLC {

11
src/test/java/org/qortal/test/crosschain/apps/CheckHTLC.java
View File

@@ -1,9 +1,6 @@
package org.qortal.test.crosschain.apps;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.LegacyAddress;
@@ -11,11 +8,13 @@ import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.script.Script.ScriptType;
import org.qortal.crosschain.Bitcoin;
import org.qortal.crosschain.Bitcoiny;
import org.qortal.crosschain.Litecoin;
import org.qortal.crosschain.BitcoinyHTLC;
import org.qortal.crosschain.Litecoin;
import org.qortal.crypto.Crypto;
import com.google.common.hash.HashCode;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
public class CheckHTLC {

15
src/test/java/org/qortal/test/crosschain/apps/Common.java
View File

@@ -1,12 +1,6 @@
package org.qortal.test.crosschain.apps;
import java.security.Security;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Collections;
import java.util.List;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -17,7 +11,12 @@ import org.qortal.crosschain.ForeignBlockchainException;
import org.qortal.settings.Settings;
import org.qortal.utils.NTP;
import com.google.common.hash.HashCode;
import java.security.Security;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Collections;
import java.util.List;
public abstract class Common {

4
src/test/java/org/qortal/test/crosschain/apps/GetNextReceiveAddress.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.crosschain.apps;
import java.security.Security;
import org.bitcoinj.core.AddressFormatException;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
@@ -11,6 +9,8 @@ import org.qortal.crosschain.ForeignBlockchainException;
import org.qortal.crosschain.Litecoin;
import org.qortal.settings.Settings;
import java.security.Security;
public class GetNextReceiveAddress {
static {

7
src/test/java/org/qortal/test/crosschain/apps/GetTransaction.java
View File

@@ -1,8 +1,6 @@
package org.qortal.test.crosschain.apps;
import java.security.Security;
import java.util.List;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.TransactionOutput;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -13,7 +11,8 @@ import org.qortal.crosschain.ForeignBlockchainException;
import org.qortal.crosschain.Litecoin;
import org.qortal.settings.Settings;
import com.google.common.hash.HashCode;
import java.security.Security;
import java.util.List;
public class GetTransaction {

10
src/test/java/org/qortal/test/crosschain/apps/GetWalletTransactions.java
View File

@@ -1,16 +1,16 @@
package org.qortal.test.crosschain.apps;
import java.security.Security;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import org.bitcoinj.core.AddressFormatException;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qortal.crosschain.*;
import org.qortal.settings.Settings;
import java.security.Security;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
public class GetWalletTransactions {
static {

17
src/test/java/org/qortal/test/crosschain/apps/RedeemHTLC.java
View File

@@ -1,23 +1,16 @@
package org.qortal.test.crosschain.apps;
import java.util.Arrays;
import java.util.List;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.*;
import org.bitcoinj.script.Script.ScriptType;
import org.qortal.crosschain.Bitcoin;
import org.qortal.crosschain.Bitcoiny;
import org.qortal.crosschain.Litecoin;
import org.qortal.crosschain.BitcoinyHTLC;
import org.qortal.crosschain.Litecoin;
import org.qortal.crypto.Crypto;
import com.google.common.hash.HashCode;
import java.util.Arrays;
import java.util.List;
public class RedeemHTLC {

17
src/test/java/org/qortal/test/crosschain/apps/RefundHTLC.java
View File

@@ -1,23 +1,16 @@
package org.qortal.test.crosschain.apps;
import java.util.Arrays;
import java.util.List;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.*;
import org.bitcoinj.script.Script.ScriptType;
import org.qortal.crosschain.Litecoin;
import org.qortal.crosschain.Bitcoin;
import org.qortal.crosschain.Bitcoiny;
import org.qortal.crosschain.BitcoinyHTLC;
import org.qortal.crosschain.Litecoin;
import org.qortal.crypto.Crypto;
import com.google.common.hash.HashCode;
import java.util.Arrays;
import java.util.List;
public class RefundHTLC {

12
src/test/java/org/qortal/test/crosschain/bitcoinv1/BitcoinACCTv1Tests.java
View File

@@ -1,16 +1,13 @@
package org.qortal.test.crosschain.bitcoinv1;
import static org.junit.Assert.*;
import java.util.function.Function;
import com.google.common.hash.HashCode;
import org.junit.Test;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.crosschain.ACCT;
import org.qortal.crosschain.BitcoinACCTv1;
import org.qortal.crosschain.AcctMode;
import org.qortal.crosschain.BitcoinACCTv1;
import org.qortal.crypto.Crypto;
import org.qortal.data.at.ATData;
import org.qortal.data.at.ATStateData;
@@ -24,7 +21,10 @@ import org.qortal.test.crosschain.ACCTTests;
import org.qortal.transaction.DeployAtTransaction;
import org.qortal.transaction.MessageTransaction;
import com.google.common.hash.HashCode;
import java.util.function.Function;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
public class BitcoinACCTv1Tests extends ACCTTests {

3
src/test/java/org/qortal/test/crosschain/bitcoinv1/DeployAT.java
View File

@@ -1,5 +1,6 @@
package org.qortal.test.crosschain.bitcoinv1;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.LegacyAddress;
@@ -27,8 +28,6 @@ import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Amounts;
import org.qortal.utils.Base58;
import com.google.common.hash.HashCode;
public class DeployAT {
private static void usage(String error) {

5
src/test/java/org/qortal/test/crosschain/litecoinv1/DeployAT.java
View File

@@ -1,7 +1,6 @@
package org.qortal.test.crosschain.litecoinv1;
import java.math.BigDecimal;
import com.google.common.hash.HashCode;
import org.bitcoinj.core.ECKey;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
@@ -22,7 +21,7 @@ import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Amounts;
import org.qortal.utils.Base58;
import com.google.common.hash.HashCode;
import java.math.BigDecimal;
public class DeployAT {

3
src/test/java/org/qortal/test/crosschain/litecoinv1/LitecoinACCTv1Tests.java
View File

@@ -1,11 +1,10 @@
package org.qortal.test.crosschain.litecoinv1;
import com.google.common.hash.HashCode;
import org.qortal.crosschain.ACCT;
import org.qortal.crosschain.LitecoinACCTv1;
import org.qortal.test.crosschain.ACCTTests;
import com.google.common.hash.HashCode;
public class LitecoinACCTv1Tests extends ACCTTests {
public static final byte[] litecoinPublicKeyHash = HashCode.fromString("bb00bb11bb22bb33bb44bb55bb66bb77bb88bb99").asBytes();

3
src/test/java/org/qortal/test/crosschain/litecoinv1/SendRedeemMessage.java
View File

@@ -1,5 +1,6 @@
package org.qortal.test.crosschain.litecoinv1;
import com.google.common.hash.HashCode;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.controller.Controller;
import org.qortal.crosschain.LitecoinACCTv1;
@@ -16,8 +17,6 @@ import org.qortal.transform.TransformationException;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import com.google.common.hash.HashCode;
public class SendRedeemMessage {
private static void usage(String error) {

3
src/test/java/org/qortal/test/crosschain/litecoinv1/SendTradeMessage.java
View File

@@ -1,5 +1,6 @@
package org.qortal.test.crosschain.litecoinv1;
import com.google.common.hash.HashCode;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.controller.Controller;
import org.qortal.crosschain.LitecoinACCTv1;
@@ -17,8 +18,6 @@ import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import org.qortal.utils.NTP;
import com.google.common.hash.HashCode;
public class SendTradeMessage {
private static void usage(String error) {

11
src/test/java/org/qortal/test/group/AdminTests.java
View File

@@ -1,17 +1,10 @@
package org.qortal.test.group;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.AddGroupAdminTransactionData;
import org.qortal.data.transaction.CancelGroupBanTransactionData;
import org.qortal.data.transaction.CreateGroupTransactionData;
import org.qortal.data.transaction.GroupBanTransactionData;
import org.qortal.data.transaction.GroupKickTransactionData;
import org.qortal.data.transaction.JoinGroupTransactionData;
import org.qortal.data.transaction.*;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
@@ -22,6 +15,8 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.Transaction.ValidationResult;
import static org.junit.Assert.*;
public class AdminTests extends Common {
@Before

3
src/test/java/org/qortal/test/group/DevGroupAdminTests.java
View File

@@ -5,8 +5,6 @@ import org.junit.Before;
import org.junit.Test;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.*;
import org.qortal.group.Group;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
@@ -17,7 +15,6 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.utils.Base58;
import static org.junit.Assert.*;

4
src/test/java/org/qortal/test/group/GroupApprovalTests.java
View File

@@ -23,10 +23,10 @@ import org.qortal.transaction.Transaction.ApprovalStatus;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.utils.Amounts;
import static org.junit.Assert.*;
import java.util.Arrays;
import static org.junit.Assert.*;
public class GroupApprovalTests extends Common {
private static final long amount = 5000L * Amounts.MULTIPLIER;

5
src/test/java/org/qortal/test/group/GroupBlockDelayTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.group;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -21,6 +19,9 @@ import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.transaction.UpdateGroupTransaction;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
public class GroupBlockDelayTests extends Common {
@Before

5
src/test/java/org/qortal/test/group/MiscTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.group;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -20,6 +18,9 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.Transaction.ValidationResult;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class MiscTests extends Common {
@Before

4
src/test/java/org/qortal/test/group/OwnerTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.group;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -20,6 +18,8 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.Transaction.ValidationResult;
import static org.junit.Assert.*;
public class OwnerTests extends Common {
@Before

6
src/test/java/org/qortal/test/minting/BlocksMintedCountTests.java
View File

@@ -1,8 +1,5 @@
package org.qortal.test.minting;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -18,6 +15,9 @@ import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class BlocksMintedCountTests extends Common {
@Before

13
src/test/java/org/qortal/test/minting/DisagreementTests.java
View File

@@ -1,11 +1,6 @@
package org.qortal.test.minting;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import io.druid.extendedset.intset.ConciseSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -25,7 +20,11 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.transform.block.BlockTransformer;
import org.roaringbitmap.IntIterator;
import io.druid.extendedset.intset.ConciseSet;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
public class DisagreementTests extends Common {

4
src/test/java/org/qortal/test/minting/RewardShareTests.java
View File

@@ -1,7 +1,5 @@
package org.qortal.test.minting;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -19,6 +17,8 @@ import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.utils.Base58;
import static org.junit.Assert.*;
public class RewardShareTests extends Common {
private static final int CANCEL_SHARE_PERCENT = -1;

13
src/test/java/org/qortal/test/minting/RewardTests.java
View File

@@ -1,10 +1,5 @@
package org.qortal.test.minting;
import static org.junit.Assert.*;
import java.math.BigInteger;
import java.util.*;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -28,6 +23,14 @@ import org.qortal.test.common.TestAccount;
import org.qortal.utils.Amounts;
import org.qortal.utils.Base58;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.*;
public class RewardTests extends Common {
private static final Logger LOGGER = LogManager.getLogger(RewardTests.class);
@Before

9
src/test/java/org/qortal/test/naming/BuySellTests.java
View File

@@ -1,9 +1,5 @@
package org.qortal.test.naming;
import static org.junit.Assert.*;
import java.util.Random;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -22,7 +18,10 @@ import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.RegisterNameTransaction;
import org.qortal.utils.Amounts;
import org.qortal.utils.NTP;
import java.util.Random;
import static org.junit.Assert.*;
public class BuySellTests extends Common {

Some files were not shown because too many files have changed in this diff Show More