Browse Source

Configured logback as default logging framework;

tags/1.1.0
huanghaiquan 5 years ago
parent
commit
e37c1fe05e
5 changed files with 29 additions and 2 deletions
  1. +1
    -1
      source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java
  2. +6
    -0
      source/ledger/ledger-core/src/test/resources/logback-test.xml
  3. +6
    -0
      source/test/test-integration/src/test/resources/logback-test.xml
  4. +6
    -0
      source/test/test-ledger-core/pom.xml
  5. +10
    -1
      source/test/test-ledger-core/src/main/java/test/perf/com/jd/blockchain/ledger/core/MerkleDatasetPerformanceTester.java

+ 1
- 1
source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/CryptoConfig.java View File

@@ -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;
}


+ 6
- 0
source/ledger/ledger-core/src/test/resources/logback-test.xml View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" />
<!-- 日志级别设置为 ERROR -->
<root level="ERROR" />
</configuration>

+ 6
- 0
source/test/test-integration/src/test/resources/logback-test.xml View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" />
<!-- 日志级别设置为 ERROR -->
<root level="ERROR" />
</configuration>

+ 6
- 0
source/test/test-ledger-core/pom.xml View File

@@ -22,8 +22,14 @@
</dependency>
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>storage-rocksdb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>crypto-classic</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

+ 10
- 1
source/test/test-ledger-core/src/main/java/test/perf/com/jd/blockchain/ledger/core/MerkleDatasetPerformanceTester.java View File

@@ -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);



Loading…
Cancel
Save