diff --git a/.classpath b/.classpath index 29aaa1bc..6b0e4082 100644 --- a/.classpath +++ b/.classpath @@ -22,5 +22,21 @@ + + + + + + + + + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index a29e55d6..cd2ffaf7 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -9,6 +9,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/lib/org/ciyam/at/1.0/at-1.0.jar b/lib/org/ciyam/at/1.0/at-1.0.jar index 57e52842..a5dd4957 100644 Binary files a/lib/org/ciyam/at/1.0/at-1.0.jar and b/lib/org/ciyam/at/1.0/at-1.0.jar differ diff --git a/lib/org/ciyam/at/maven-metadata-local.xml b/lib/org/ciyam/at/maven-metadata-local.xml index da76b2ba..61f9d592 100644 --- a/lib/org/ciyam/at/maven-metadata-local.xml +++ b/lib/org/ciyam/at/maven-metadata-local.xml @@ -7,6 +7,6 @@ 1.0 - 20181101172102 + 20181105100741 diff --git a/pom.xml b/pom.xml index 5c617e1e..4b5d0394 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ generate-resources - replace + replace @@ -225,5 +225,23 @@ bitcoinj-core 0.14.7 + + + org.bouncycastle + bcprov-jdk15on + 1.60 + + + + org.slf4j + slf4j-api + 1.7.12 + + + + org.slf4j + slf4j-simple + 1.7.12 + \ No newline at end of file diff --git a/tests/test/ATTests.java b/tests/test/ATTests.java index 860d381d..34f8184f 100644 --- a/tests/test/ATTests.java +++ b/tests/test/ATTests.java @@ -12,6 +12,7 @@ import data.at.ATStateData; import data.block.BlockData; import data.block.BlockTransactionData; import data.transaction.DeployATTransactionData; +import qora.assets.Asset; import qora.transaction.DeployATTransaction; import repository.DataException; import repository.Repository; @@ -45,8 +46,8 @@ public class ATTests extends Common { byte[] reference = Base58.decode("2D3jX1pEgu6irsQ7QzJb85QP1D9M45dNyP5M9a3WFHndU5ZywF4F5pnUurcbzMnGMcTwpAY6H7DuLw8cUBU66ao1"); byte[] signature = Base58.decode("2dZ4megUyNoYYY7qWmuSd4xw1yUKgPPF97yBbeddh8aKuC8PLpz7Xvf3r6Zjv1zwGrR8fEAHuaztCPD4KQp76KdL"); - DeployATTransactionData transactionData = new DeployATTransactionData(creatorPublicKey, name, description, ATType, tags, creationBytes, amount, fee, - timestamp, reference, signature); + DeployATTransactionData transactionData = new DeployATTransactionData(creatorPublicKey, name, description, ATType, tags, creationBytes, amount, + Asset.QORA, fee, timestamp, reference, signature); try (final Repository repository = RepositoryManager.getRepository()) { repository.getTransactionRepository().save(transactionData); diff --git a/tests/test/BlockchainTests.java b/tests/test/BlockchainTests.java index bdb2662f..9dc2258b 100644 --- a/tests/test/BlockchainTests.java +++ b/tests/test/BlockchainTests.java @@ -1,7 +1,6 @@ package test; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import qora.block.BlockChain; import repository.DataException; diff --git a/tests/test/Common.java b/tests/test/Common.java index fe1788ef..9e196f2b 100644 --- a/tests/test/Common.java +++ b/tests/test/Common.java @@ -1,7 +1,5 @@ package test; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.AfterAll; diff --git a/tests/test/NavigationTests.java b/tests/test/NavigationTests.java index 952a59c0..bb53d1dc 100644 --- a/tests/test/NavigationTests.java +++ b/tests/test/NavigationTests.java @@ -20,7 +20,7 @@ public class NavigationTests extends Common { TransactionRepository transactionRepository = repository.getTransactionRepository(); assertTrue(repository.getBlockRepository().getBlockchainHeight() >= 49778, - "Migrate from old database to at least block 49778 before running this test"); + "Migrate from old database to at least block 49778 before running this test"); String signature58 = "1211ZPwG3hk5evWzXCZi9hMDRpwumWmkENjwWkeTCik9xA5uoYnxzF7rwR5hmHH3kG2RXo7ToCAaRc7dvnynByJt"; byte[] signature = Base58.decode(signature58); @@ -31,9 +31,12 @@ public class NavigationTests extends Common { assertNotNull(transactionData, "Transaction data not loaded from repository"); assertEquals(TransactionType.PAYMENT, transactionData.getType(), "Transaction data not PAYMENT type"); - BlockData blockData = transactionRepository.getBlockDataFromSignature(signature); - assertNotNull(blockData, "Block 49778 not loaded from database"); + int transactionHeight = transactionRepository.getHeightFromSignature(signature); + assertNotEquals(0, transactionHeight, "Transaction not found or transaction's block not found"); + assertEquals(49778, transactionHeight, "Transaction's block height expected to be 49778"); + BlockData blockData = repository.getBlockRepository().fromHeight(transactionHeight); + assertNotNull(blockData, "Block 49778 not loaded from database"); System.out.println("Block " + blockData.getHeight() + ", signature: " + Base58.encode(blockData.getSignature())); assertEquals((Integer) 49778, blockData.getHeight()); diff --git a/tests/test/SaveTests.java b/tests/test/SaveTests.java index 80bbf74e..cdfb3af7 100644 --- a/tests/test/SaveTests.java +++ b/tests/test/SaveTests.java @@ -4,7 +4,6 @@ import java.math.BigDecimal; import java.time.Instant; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import data.transaction.PaymentTransactionData; import qora.account.PublicKeyAccount;