diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java
index 8f5d2ea1..2a23f8bf 100644
--- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java
+++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java
@@ -82,7 +82,7 @@ public class CryptoConfig implements CryptoSetting {
public void setHashAlgorithm(short hashAlgorithm) {
if (codeAlgorithms == null || !codeAlgorithms.containsKey(hashAlgorithm)) {
- throw new LedgerException("The specified algorithm[" + hashAlgorithm + "] has no provider!");
+ throw new LedgerException("Current CryptoConfig has no crypto provider!");
}
this.hashAlgorithm = hashAlgorithm;
}
diff --git a/source/ledger/ledger-core/src/test/resources/logback-test.xml b/source/ledger/ledger-core/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..29013782
--- /dev/null
+++ b/source/ledger/ledger-core/src/test/resources/logback-test.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test/test-integration/src/test/resources/logback-test.xml b/source/test/test-integration/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..29013782
--- /dev/null
+++ b/source/test/test-integration/src/test/resources/logback-test.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/test/test-ledger-core/pom.xml b/source/test/test-ledger-core/pom.xml
index c7350156..4d831fdc 100644
--- a/source/test/test-ledger-core/pom.xml
+++ b/source/test/test-ledger-core/pom.xml
@@ -22,8 +22,14 @@
com.jd.blockchain
+ storage-rocksdb
+ ${project.version}
+
+
+ com.jd.blockchain
crypto-classic
${project.version}
+
\ No newline at end of file
diff --git a/source/test/test-ledger-core/src/main/java/test/perf/com/jd/blockchain/ledger/core/MerkleDatasetPerformanceTester.java b/source/test/test-ledger-core/src/main/java/test/perf/com/jd/blockchain/ledger/core/MerkleDatasetPerformanceTester.java
index ef2f6064..bd614126 100644
--- a/source/test/test-ledger-core/src/main/java/test/perf/com/jd/blockchain/ledger/core/MerkleDatasetPerformanceTester.java
+++ b/source/test/test-ledger-core/src/main/java/test/perf/com/jd/blockchain/ledger/core/MerkleDatasetPerformanceTester.java
@@ -3,9 +3,10 @@ package test.perf.com.jd.blockchain.ledger.core;
import java.io.IOException;
import java.util.Random;
-import com.jd.blockchain.crypto.CryptoAlgorithm;
import com.jd.blockchain.crypto.Crypto;
+import com.jd.blockchain.crypto.CryptoProvider;
import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.service.classic.ClassicCryptoService;
import com.jd.blockchain.ledger.core.CryptoConfig;
import com.jd.blockchain.ledger.core.MerkleDataSet;
import com.jd.blockchain.storage.service.DbConnection;
@@ -16,6 +17,8 @@ import com.jd.blockchain.storage.service.utils.MemoryKVStorage;
public class MerkleDatasetPerformanceTester {
+ private static final String[] SUPPORTED_PROVIDERS = { ClassicCryptoService.class.getName() };
+
private static final String MKL_KEY_PREFIX = "";
public static void main(String[] args) {
@@ -131,7 +134,13 @@ public class MerkleDatasetPerformanceTester {
VersioningKVStorage verStorage) {
Random rand = new Random();
+ CryptoProvider[] supportedProviders = new CryptoProvider[SUPPORTED_PROVIDERS.length];
+ for (int i = 0; i < SUPPORTED_PROVIDERS.length; i++) {
+ supportedProviders[i] = Crypto.getProvider(SUPPORTED_PROVIDERS[i]);
+ }
+
CryptoConfig cryptoConfig = new CryptoConfig();
+ cryptoConfig.setSupportedProviders(supportedProviders);
cryptoConfig.setHashAlgorithm(Crypto.getAlgorithm("SHA256"));
cryptoConfig.setAutoVerifyHash(true);