Refactored packages in crypto framework;

source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/client/BftsmartClientIdentification.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.consensus.bftsmart.client;
 import com.jd.blockchain.consensus.ClientIdentification;
 import com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 
 public class BftsmartClientIdentification implements ClientIdentification {
 

source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/client/BftsmartConsensusClientFactory.java

@@ -10,12 +10,12 @@ import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingSettings;
 import com.jd.blockchain.consensus.client.ClientFactory;
 import com.jd.blockchain.consensus.client.ClientSettings;
 import com.jd.blockchain.consensus.client.ConsensusClient;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
+import com.jd.blockchain.crypto.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureFunction;
 import com.jd.blockchain.utils.net.NetworkAddress;
 
 public class BftsmartConsensusClientFactory implements ClientFactory {

source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartConsensusManageService.java

@@ -8,7 +8,7 @@ import com.jd.blockchain.consensus.ConsensusManageService;
 import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingConfig;
 import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingSettings;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
+import com.jd.blockchain.crypto.SignatureFunction;
 import com.jd.blockchain.utils.serialize.binary.BinarySerializeUtils;
 
 public class BftsmartConsensusManageService implements ConsensusManageService {

source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ClientIdentification.java

@@ -4,7 +4,7 @@ import com.jd.blockchain.binaryproto.DataContract;
 import com.jd.blockchain.binaryproto.DataField;
 import com.jd.blockchain.consts.TypeCodes;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 import com.jd.blockchain.utils.ValueType;
 
 /**

source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/client/ClientFactory.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.consensus.client;
 import com.jd.blockchain.consensus.ClientIdentification;
 import com.jd.blockchain.consensus.ClientIncomingSettings;
 import com.jd.blockchain.consensus.ConsensusManageService;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 
 public interface ClientFactory {
 

source/consensus/consensus-mq/src/main/java/com/jd/blockchain/consensus/mq/client/MsgQueueClientFactory.java

@@ -16,11 +16,11 @@ import com.jd.blockchain.consensus.mq.config.MsgQueueClientConfig;
 import com.jd.blockchain.consensus.mq.settings.MsgQueueClientIncomingSettings;
 import com.jd.blockchain.consensus.mq.settings.MsgQueueClientSettings;
 import com.jd.blockchain.consensus.mq.settings.MsgQueueConsensusSettings;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
+import com.jd.blockchain.crypto.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureFunction;
 
 /**
  *

source/consensus/consensus-mq/src/main/java/com/jd/blockchain/consensus/mq/client/MsgQueueClientIdentification.java

@@ -11,7 +11,7 @@ package com.jd.blockchain.consensus.mq.client;
 import com.jd.blockchain.consensus.ClientIdentification;
 import com.jd.blockchain.consensus.mq.MsgQueueConsensusProvider;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 
 /**
  *

source/consensus/consensus-mq/src/main/java/com/jd/blockchain/consensus/mq/server/MsgQueueConsensusManageService.java

@@ -18,7 +18,7 @@ import com.jd.blockchain.consensus.mq.settings.MsgQueueClientIncomingSettings;
 import com.jd.blockchain.consensus.mq.settings.MsgQueueConsensusSettings;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
+import com.jd.blockchain.crypto.SignatureFunction;
 
 /**
  *

source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java

@@ -1,9 +1,9 @@
 package com.jd.blockchain;
 
 import com.jd.blockchain.contract.model.ContractDeployExeUtil;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.BlockchainKeyPair;
 import com.jd.blockchain.tools.keygen.KeyGenCommand;
 import com.jd.blockchain.utils.codec.Base58Utils;

source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractDeployExeUtil.java

@@ -6,9 +6,9 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import com.jd.blockchain.binaryproto.DataContractRegistry;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.BlockchainIdentity;
 import com.jd.blockchain.ledger.BlockchainIdentityData;
 import com.jd.blockchain.ledger.BlockchainKeyGenerator;

source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEventContext.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.contract.model;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.BlockchainIdentity;
 import com.jd.blockchain.ledger.TransactionRequest;
 

source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LocalContractEventContext.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.contract.model;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.BlockchainIdentity;
 import com.jd.blockchain.ledger.TransactionRequest;
 import com.jd.blockchain.utils.io.ByteArray;

source/crypto/crypto-classic/src/main/java/com/jd/blockchain/crypto/service/classic/AESEncryptionFunction.java

@@ -9,9 +9,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.crypto.SymmetricKey;
-import com.jd.blockchain.crypto.symmetric.SymmetricCiphertext;
-import com.jd.blockchain.crypto.symmetric.SymmetricEncryptionFunction;
 import com.jd.blockchain.utils.security.AESUtils;
 
 public class AESEncryptionFunction implements SymmetricEncryptionFunction {

source/crypto/crypto-classic/src/main/java/com/jd/blockchain/crypto/service/classic/ECDSASignatureFunction.java

@@ -1,9 +1,11 @@
 package com.jd.blockchain.crypto.service.classic;
 
 import com.jd.blockchain.crypto.CryptoAlgorithm;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.*;
+import com.jd.blockchain.crypto.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureFunction;
 
 public class ECDSASignatureFunction implements SignatureFunction {
 

source/crypto/crypto-classic/src/main/java/com/jd/blockchain/crypto/service/classic/ED25519SignatureFunction.java

@@ -7,11 +7,11 @@ import static com.jd.blockchain.crypto.CryptoKeyType.PUBLIC;
 
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoException;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
+import com.jd.blockchain.crypto.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureFunction;
 import com.jd.blockchain.crypto.utils.classic.ED25519Utils;
 
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;

source/crypto/crypto-classic/src/main/java/com/jd/blockchain/crypto/service/classic/RIPEMD160HashFunction.java

@@ -6,8 +6,8 @@ import java.util.Arrays;
 
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoException;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.utils.security.RipeMD160Utils;
 
 public class RIPEMD160HashFunction implements HashFunction {

source/crypto/crypto-classic/src/main/java/com/jd/blockchain/crypto/service/classic/RSACryptoFunction.java

@@ -1,10 +1,14 @@
 package com.jd.blockchain.crypto.service.classic;
 
+import com.jd.blockchain.crypto.AsymmetricCiphertext;
+import com.jd.blockchain.crypto.AsymmetricEncryptionFunction;
 import com.jd.blockchain.crypto.Ciphertext;
 import com.jd.blockchain.crypto.CryptoAlgorithm;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.*;
+import com.jd.blockchain.crypto.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureFunction;
 
 /**
  * @author zhanglin33

source/crypto/crypto-classic/src/main/java/com/jd/blockchain/crypto/service/classic/SHA256HashFunction.java

@@ -6,8 +6,8 @@ import java.util.Arrays;
 
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoException;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.utils.security.ShaUtils;
 
 public class SHA256HashFunction implements HashFunction {

source/crypto/crypto-classic/src/test/java/test/com/jd/blockchain/crypto/service/classic/AESEncryptionFunctionTest.java

@@ -1,7 +1,6 @@
 package test.com.jd.blockchain.crypto.service.classic;
 
 import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.crypto.symmetric.SymmetricEncryptionFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/crypto/crypto-classic/src/test/java/test/com/jd/blockchain/crypto/service/classic/ED25519SignatureFunctionTest.java

@@ -1,9 +1,6 @@
 package test.com.jd.blockchain.crypto.service.classic;
 
 import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/crypto/crypto-classic/src/test/java/test/com/jd/blockchain/crypto/service/classic/RIPEMD160HashFunctionTest.java

@@ -3,8 +3,8 @@ package test.com.jd.blockchain.crypto.service.classic;
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoException;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/crypto/crypto-classic/src/test/java/test/com/jd/blockchain/crypto/service/classic/SHA256HashFunctionTest.java

@@ -3,8 +3,8 @@ package test.com.jd.blockchain.crypto.service.classic;
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoException;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/asymmetric/AsymmetricCiphertext.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/AsymmetricCiphertext.java

@@ -1,8 +1,4 @@
-package com.jd.blockchain.crypto.asymmetric;
-
-import com.jd.blockchain.crypto.BaseCryptoBytes;
-import com.jd.blockchain.crypto.Ciphertext;
-import com.jd.blockchain.crypto.CryptoAlgorithm;
+package com.jd.blockchain.crypto;
 
 public class AsymmetricCiphertext extends BaseCryptoBytes implements Ciphertext {
 

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/asymmetric/AsymmetricEncryptionFunction.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/AsymmetricEncryptionFunction.java

@@ -1,10 +1,4 @@
-package com.jd.blockchain.crypto.asymmetric;
-
-import com.jd.blockchain.crypto.Ciphertext;
-import com.jd.blockchain.crypto.CryptoFunction;
-import com.jd.blockchain.crypto.CryptoKeyPairGenerator;
-import com.jd.blockchain.crypto.PrivKey;
-import com.jd.blockchain.crypto.PubKey;
+package com.jd.blockchain.crypto;
 
 public interface AsymmetricEncryptionFunction extends CryptoKeyPairGenerator, CryptoFunction {
 

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoAlgorithmType.java

@@ -1,24 +0,0 @@
-//package com.jd.blockchain.crypto;
-//
-//public class CryptoAlgorithmType {
-//	/**
-//	 * Hash 类算法的掩码；
-//	 */
-//	public static final byte HASH = 0x10;
-//
-//	/**
-//	 * 非对称加密类算法的掩码；
-//	 */
-//	public static final byte ASYMMETRIC = 0x20;
-//
-//	/**
-//	 * 对称加密类算法的掩码；
-//	 */
-//	public static final byte SYMMETRIC = 0x30;
-//
-//	/**
-//	 * 随机数类算法的掩码；
-//	 */
-//	public static final byte RANDOM = 0x40;
-//
-//}

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoAlgorithm_Enum.java

@@ -1,150 +0,0 @@
-//package com.jd.blockchain.crypto;
-//
-//import com.jd.blockchain.base.data.TypeCodes;
-//import com.jd.blockchain.binaryproto.EnumContract;
-//import com.jd.blockchain.binaryproto.EnumField;
-//import com.jd.blockchain.utils.ValueType;
-//
-//
-//@EnumContract(code= TypeCodes.CRYPTO_ALGORITHM)
-//public enum CryptoAlgorithm_Enum {
-//
-//	SHA256(CryptoAlgorithmType.HASH, (byte) 0x01, false, false),
-//
-//	RIPEMD160(CryptoAlgorithmType.HASH, (byte) 0x02, false, false),
-//
-//	SM3(CryptoAlgorithmType.HASH, (byte) 0x03, false, false),
-//
-//	JNISHA256(CryptoAlgorithmType.HASH, (byte) 0x04, false, false),
-//
-//	JNIRIPEMD160(CryptoAlgorithmType.HASH, (byte) 0x05, false, false),
-//
-//	// 非对称签名/加密算法；
-//
-//	/**
-//	 * RSA 签名算法；可签名，可加密；
-//	 */
-//	RSA(CryptoAlgorithmType.ASYMMETRIC, (byte) 0x01, true, true),
-//
-//	/**
-//	 * ED25519 签名算法；只用于签名，没有加密特性；
-//	 */
-//	ED25519(CryptoAlgorithmType.ASYMMETRIC, (byte) 0x02, true, false),
-//
-//	/**
-//	 * ECDSA 签名算法；只用于签名，没有加密特性；
-//	 */
-//	ECDSA(CryptoAlgorithmType.ASYMMETRIC, (byte) 0x03, true, false),
-//
-//	/**
-//	 * 国密 SM2 算法；可签名，可加密；
-//	 */
-//	SM2(CryptoAlgorithmType.ASYMMETRIC, (byte) 0x04, true, true),
-//
-//	/**
-//	 * JNIED25519 签名算法；只用于签名，没有加密特性；
-//	 */
-//	JNIED25519(CryptoAlgorithmType.ASYMMETRIC, (byte) 0x05, true, false),
-//
-//	// 对称加密；
-//	/**
-//	 * AES 算法；可加密；
-//	 */
-//	AES(CryptoAlgorithmType.SYMMETRIC, (byte) 0x01, false, true),
-//
-//	SM4(CryptoAlgorithmType.SYMMETRIC, (byte) 0x02, false, true),
-//
-//	// 随机性；
-//	/**
-//	 * 随机数算法，待定；
-//	 */
-//	JAVA_SECURE(CryptoAlgorithmType.RANDOM, (byte) 0x01, false, false);
-//
-//	/**
-//	 * 密码算法的代号；<br>
-//	 * 注：只占16位；
-//	 */
-//	@EnumField(type= ValueType.INT8)
-//	public final byte CODE;
-//
-//	private final boolean signable;
-//
-//	private final boolean encryptable;
-//
-//	private CryptoAlgorithm_Enum(byte algType, byte algId, boolean signable, boolean encryptable) {
-//		this.CODE = (byte) (algType | algId);
-//		this.signable = signable;
-//		this.encryptable = encryptable;
-//	}
-//
-//	/**
-//	 * 是否属于摘要算法；
-//	 * 
-//	 * @return
-//	 */
-//	public boolean isHash() {
-//		return (CODE & CryptoAlgorithmType.HASH) == CryptoAlgorithmType.HASH;
-//	}
-//
-//	/**
-//	 * 是否属于非对称密码算法；
-//	 * 
-//	 * @return
-//	 */
-//	public boolean isAsymmetric() {
-//		return (CODE & CryptoAlgorithmType.ASYMMETRIC) == CryptoAlgorithmType.ASYMMETRIC;
-//	}
-//
-//	/**
-//	 * 是否属于对称密码算法；
-//	 * 
-//	 * @return
-//	 */
-//	public boolean isSymmetric() {
-//		return (CODE & CryptoAlgorithmType.SYMMETRIC) == CryptoAlgorithmType.SYMMETRIC;
-//	}
-//
-//	/**
-//	 * 是否属于随机数算法；
-//	 * 
-//	 * @return
-//	 */
-//	public boolean isRandom() {
-//		return (CODE & CryptoAlgorithmType.RANDOM) == CryptoAlgorithmType.RANDOM;
-//	}
-//
-//	/**
-//	 * 是否支持签名操作；
-//	 * 
-//	 * @return
-//	 */
-//	public boolean isSignable() {
-//		return signable;
-//	}
-//
-//	/**
-//	 * 是否支持加密操作；
-//	 * 
-//	 * @return
-//	 */
-//	public boolean isEncryptable() {
-//		return encryptable;
-//	}
-//
-//	/**
-//	 * 返回指定编码对应的枚举实例；<br>
-//	 * 
-//	 * 如果不存在，则返回 null；
-//	 * 
-//	 * @param code
-//	 * @return
-//	 */
-//	public static CryptoAlgorithm_Enum valueOf(byte code) {
-//		for (CryptoAlgorithm_Enum alg : CryptoAlgorithm_Enum.values()) {
-//			if (alg.CODE == code) {
-//				return alg;
-//			}
-//		}
-//		throw new IllegalArgumentException("CryptoAlgorithm doesn't support enum code[" + code + "]!");
-//	}
-//}

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoFactory.java

@@ -1,15 +0,0 @@
-//package com.jd.blockchain.crypto;
-//
-//import com.jd.blockchain.crypto.asymmetric.AsymmetricCryptography;
-//import com.jd.blockchain.crypto.hash.HashCryptography;
-//import com.jd.blockchain.crypto.symmetric.SymmetricCryptography;
-//
-//public interface CryptoFactory {
-//
-//	HashCryptography hashCryptography();
-//
-//	AsymmetricCryptography asymmetricCryptography();
-//
-//	SymmetricCryptography symmetricCryptography();
-//
-//}

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/asymmetric/CryptoKeyPair.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoKeyPair.java

@@ -1,8 +1,4 @@
-package com.jd.blockchain.crypto.asymmetric;
-
-import com.jd.blockchain.crypto.CryptoAlgorithm;
-import com.jd.blockchain.crypto.PrivKey;
-import com.jd.blockchain.crypto.PubKey;
+package com.jd.blockchain.crypto;
 
 public class CryptoKeyPair {
 

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoKeyPairGenerator.java

@@ -1,7 +1,5 @@
 package com.jd.blockchain.crypto;
 
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-
 public interface CryptoKeyPairGenerator {
 
     /**

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoServiceProviders.java

@@ -7,10 +7,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.jd.blockchain.crypto.asymmetric.AsymmetricEncryptionFunction;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
-import com.jd.blockchain.crypto.hash.HashFunction;
-import com.jd.blockchain.crypto.symmetric.SymmetricEncryptionFunction;
 import com.jd.blockchain.provider.Provider;
 import com.jd.blockchain.provider.ProviderManager;
 
@@ -136,6 +132,14 @@ public final class CryptoServiceProviders {
 		return code == null ? null : algorithms.get(code);
 	}
 
+	public static RandomFunction getRandomFunction(short algorithmCode) {
+		CryptoAlgorithm algorithm = getAlgorithm(algorithmCode);
+		if (algorithm == null) {
+			throw new CryptoException("Algorithm [code:" + algorithmCode + "] has no service provider!");
+		}
+		return getRandomFunction(algorithm);
+	}
+
 	public static RandomFunction getRandomFunction(String algorithmName) {
 		CryptoAlgorithm algorithm = getAlgorithm(algorithmName);
 		if (algorithm == null) {
@@ -158,6 +162,14 @@ public final class CryptoServiceProviders {
 		return (RandomFunction) func;
 	}
 
+	public static HashFunction getHashFunction(short algorithmCode) {
+		CryptoAlgorithm algorithm = getAlgorithm(algorithmCode);
+		if (algorithm == null) {
+			throw new CryptoException("Algorithm [code:" + algorithmCode + "] has no service provider!");
+		}
+		return getHashFunction(algorithm);
+	}
+
 	public static HashFunction getHashFunction(String algorithmName) {
 		CryptoAlgorithm algorithm = getAlgorithm(algorithmName);
 		if (algorithm == null) {
@@ -180,6 +192,14 @@ public final class CryptoServiceProviders {
 		return (HashFunction) func;
 	}
 
+	public static AsymmetricEncryptionFunction getAsymmetricEncryptionFunction(short algorithmCode) {
+		CryptoAlgorithm algorithm = getAlgorithm(algorithmCode);
+		if (algorithm == null) {
+			throw new CryptoException("Algorithm [code:" + algorithmCode + "] has no service provider!");
+		}
+		return getAsymmetricEncryptionFunction(algorithm);
+	}
+
 	public static AsymmetricEncryptionFunction getAsymmetricEncryptionFunction(String algorithmName) {
 		CryptoAlgorithm algorithm = getAlgorithm(algorithmName);
 		if (algorithm == null) {
@@ -202,6 +222,14 @@ public final class CryptoServiceProviders {
 		return (AsymmetricEncryptionFunction) func;
 	}
 
+	public static SignatureFunction getSignatureFunction(Short algorithmCode) {
+		CryptoAlgorithm algorithm = getAlgorithm(algorithmCode);
+		if (algorithm == null) {
+			throw new CryptoException("Algorithm [code:" + algorithmCode + "] has no service provider!");
+		}
+		return getSignatureFunction(algorithm);
+	}
+
 	public static SignatureFunction getSignatureFunction(String algorithmName) {
 		CryptoAlgorithm algorithm = getAlgorithm(algorithmName);
 		if (algorithm == null) {
@@ -224,6 +252,14 @@ public final class CryptoServiceProviders {
 		return (SignatureFunction) func;
 	}
 
+	public static SymmetricEncryptionFunction getSymmetricEncryptionFunction(short algorithmCode) {
+		CryptoAlgorithm algorithm = getAlgorithm(algorithmCode);
+		if (algorithm == null) {
+			throw new CryptoException("Algorithm [code:" + algorithmCode + "] has no service provider!");
+		}
+		return getSymmetricEncryptionFunction(algorithm);
+	}
+
 	public static SymmetricEncryptionFunction getSymmetricEncryptionFunction(String algorithmName) {
 		CryptoAlgorithm algorithm = getAlgorithm(algorithmName);
 		if (algorithm == null) {
@@ -246,6 +282,14 @@ public final class CryptoServiceProviders {
 		return (SymmetricEncryptionFunction) func;
 	}
 
+	public static CryptoFunction getCryptoFunction(short algorithmCode) {
+		CryptoAlgorithm algorithm = getAlgorithm(algorithmCode);
+		if (algorithm == null) {
+			throw new CryptoException("Algorithm [code:" + algorithmCode + "] has no service provider!");
+		}
+		return getCryptoFunction(algorithm);
+	}
+
 	public static CryptoFunction getCryptoFunction(String algorithmName) {
 		CryptoAlgorithm algorithm = getAlgorithm(algorithmName);
 		if (algorithm == null) {

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/hash/HashDigest.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/HashDigest.java

@@ -1,11 +1,7 @@
-package com.jd.blockchain.crypto.hash;
+package com.jd.blockchain.crypto;
 
 import java.io.Serializable;
 
-import com.jd.blockchain.crypto.BaseCryptoBytes;
-import com.jd.blockchain.crypto.CryptoAlgorithm;
-import com.jd.blockchain.crypto.CryptoDigest;
-
 public class HashDigest extends BaseCryptoBytes implements CryptoDigest,Serializable {
 
 	private static final long serialVersionUID = 693895170514236428L;

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/hash/HashFunction.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/HashFunction.java

@@ -1,6 +1,4 @@
-package com.jd.blockchain.crypto.hash;
-
-import com.jd.blockchain.crypto.CryptoFunction;
+package com.jd.blockchain.crypto;
 
 public interface HashFunction extends CryptoFunction {
 

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/asymmetric/SignatureDigest.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/SignatureDigest.java

@@ -1,8 +1,4 @@
-package com.jd.blockchain.crypto.asymmetric;
-
-import com.jd.blockchain.crypto.BaseCryptoBytes;
-import com.jd.blockchain.crypto.CryptoAlgorithm;
-import com.jd.blockchain.crypto.CryptoDigest;
+package com.jd.blockchain.crypto;
 
 public class SignatureDigest extends BaseCryptoBytes implements CryptoDigest {
 	public SignatureDigest() {

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/asymmetric/SignatureFunction.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/SignatureFunction.java

@@ -1,9 +1,4 @@
-package com.jd.blockchain.crypto.asymmetric;
-
-import com.jd.blockchain.crypto.CryptoFunction;
-import com.jd.blockchain.crypto.CryptoKeyPairGenerator;
-import com.jd.blockchain.crypto.PrivKey;
-import com.jd.blockchain.crypto.PubKey;
+package com.jd.blockchain.crypto;
 
 public interface SignatureFunction extends CryptoKeyPairGenerator, CryptoFunction {
 

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/symmetric/SymmetricCiphertext.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/SymmetricCiphertext.java

@@ -1,8 +1,4 @@
-package com.jd.blockchain.crypto.symmetric;
-
-import com.jd.blockchain.crypto.BaseCryptoBytes;
-import com.jd.blockchain.crypto.Ciphertext;
-import com.jd.blockchain.crypto.CryptoAlgorithm;
+package com.jd.blockchain.crypto;
 
 public class SymmetricCiphertext extends BaseCryptoBytes implements Ciphertext {
 
@@ -14,13 +10,6 @@ public class SymmetricCiphertext extends BaseCryptoBytes implements Ciphertext {
 		super(cryptoBytes);
 	}
 
-//	@Override
-//	protected void support(CryptoAlgorithm algorithm) {
-//		if (!algorithm.isSymmetric()) {
-//			throw new CryptoException("SymmetricCiphertext doesn't support algorithm[" + algorithm + "]!");
-//		}
-//	}
-
 	@Override
 	protected boolean support(CryptoAlgorithm algorithm) {
 		return CryptoAlgorithm.isEncryptionAlgorithm(algorithm) && CryptoAlgorithm.hasSymmetricKey(algorithm);

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/symmetric/SymmetricEncryptionFunction.java → source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/SymmetricEncryptionFunction.java

@@ -1,13 +1,8 @@
-package com.jd.blockchain.crypto.symmetric;
+package com.jd.blockchain.crypto;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.jd.blockchain.crypto.Ciphertext;
-import com.jd.blockchain.crypto.CryptoFunction;
-import com.jd.blockchain.crypto.CryptoSymmetricKeyGenerator;
-import com.jd.blockchain.crypto.SymmetricKey;
-
 public interface SymmetricEncryptionFunction extends CryptoSymmetricKeyGenerator, CryptoFunction {
 
 	/**

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/asymmetric/AsymmetricCryptography.java

@@ -1,84 +0,0 @@
-//package com.jd.blockchain.crypto.asymmetric;
-//
-//import com.jd.blockchain.crypto.Ciphertext;
-//import com.jd.blockchain.crypto.CryptoAlgorithm;
-//import com.jd.blockchain.crypto.PrivKey;
-//import com.jd.blockchain.crypto.PubKey;
-//
-//public interface AsymmetricCryptography {
-//
-//	/**
-//	 * 生成密钥对；
-//	 *
-//	 * @param algorithm
-//	 * @return
-//	 */
-//	CryptoKeyPair generateKeyPair(CryptoAlgorithm algorithm);
-//
-//	/**
-//	 * 获取签名方法；
-//	 *
-//	 * @param algorithm
-//	 * @return
-//	 */
-//	SignatureFunction getSignatureFunction(CryptoAlgorithm algorithm);
-//
-//	/**
-//	 * 校验签名摘要和数据是否一致；
-//	 *
-//	 * @param digestBytes 签名摘要数据
-//	 * @param pubKeyBytes 公钥数据
-//	 * @param data 被签名数据
-//	 * @return
-//	 */
-//	boolean verify(byte[] digestBytes, byte[] pubKeyBytes, byte[] data);
-//
-//	/**
-//	 * 获取非对称加密方法；
-//	 *
-//	 * @param algorithm
-//	 * @return
-//	 */
-//	AsymmetricEncryptionFunction getAsymmetricEncryptionFunction(CryptoAlgorithm algorithm);
-//
-//	/**
-//	 * 解密；
-//	 *
-//	 * @param privKeyBytes
-//	 * @param ciphertextBytes
-//	 * @return
-//	 */
-//	byte[] decrypt(byte[] privKeyBytes, byte[] ciphertextBytes);
-//
-//
-//	Ciphertext resolveCiphertext(byte[] ciphertextBytes);
-//
-//	Ciphertext tryResolveCiphertext(byte[] ciphertextBytes);
-//
-//	/**
-//	 * @param digestBytes 待解析签名摘要
-//	 * @return
-//	 */
-//	SignatureDigest resolveSignatureDigest(byte[] digestBytes);
-//
-//	SignatureDigest tryResolveSignatureDigest(byte[] digestBytes);
-//
-//	/**
-//	 * 由私钥恢复公钥；
-//	 *
-//	 * @param privKeyBytes 包含算法标识、密钥掩码和私钥的字节数组
-//	 * @return 包含算法标识、密钥掩码和公钥的字节数组
-//	 */
-//	byte[] retrievePubKey(byte[] privKeyBytes);
-//
-//	byte[] tryRetrievePubKeyBytes(byte[] privKeyBytes);
-//
-//	PubKey resolvePubKey(byte[] pubKeyBytes);
-//
-//	PubKey tryResolvePubKey(byte[] pubKeyBytes);
-//
-//	PrivKey resolvePrivKey(byte[] privKeyBytes);
-//
-//	PrivKey tryResolvePrivKey(byte[] privKeyBytes);
-//
-//}

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/hash/HashCryptography.java

@@ -1,50 +0,0 @@
-//package com.jd.blockchain.crypto.hash;
-//
-//import com.jd.blockchain.crypto.CryptoAlgorithm;
-//import com.jd.blockchain.crypto.CryptoException;
-//
-//public interface HashCryptography {
-//
-//	/**
-//	 * return HashFunction instance of the specified hash alg;
-//	 *
-//	 *
-//	 * if alg out of hash alg,then throws {@link IllegalArgumentException}
-//	 *
-//	 * @param algorithm
-//	 * @return
-//	 */
-//	HashFunction getFunction(CryptoAlgorithm algorithm);
-//
-//	/**
-//	 * 校验 hash 摘要与指定的数据是否匹配；
-//	 *
-//	 * @param digestBytes
-//	 * @param data
-//	 * @return
-//	 */
-//	boolean verify(byte[] digestBytes, byte[] data);
-//
-//	boolean verify(HashDigest digest, byte[] data);
-//
-//	/**
-//	 * 解析指定的 hash 摘要； <br>
-//	 *
-//	 * 如果不符合哈希摘要的编码格式，则引发 {@link CryptoException} 异常；
-//	 *
-//	 * @param digestBytes
-//	 * @return
-//	 */
-//	HashDigest resolveHashDigest(byte[] digestBytes);
-//
-//	/**
-//	 * 解析指定的 hash 摘要； <br>
-//	 *
-//	 * 如果不符合哈希摘要的编码格式，则返回 null；
-//	 *
-//	 * @param digestBytes
-//	 * @return
-//	 */
-//	HashDigest tryResolveHashDigest(byte[] digestBytes);
-//
-//}

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/serialize/ByteArrayObjectDeserializer.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.parser.DefaultJSONParser;
 import com.alibaba.fastjson.parser.JSONToken;
 import com.alibaba.fastjson.parser.ParserConfig;
 import com.alibaba.fastjson.parser.deserializer.JavaBeanDeserializer;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 import com.jd.blockchain.utils.Bytes;
 import com.jd.blockchain.utils.codec.Base58Utils;
 import com.jd.blockchain.utils.io.BytesSlice;

source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/serialize/ByteArrayObjectSerializer.java

@@ -2,9 +2,9 @@ package com.jd.blockchain.crypto.serialize;
 
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.ObjectSerializer;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 import com.jd.blockchain.utils.Bytes;
 import com.jd.blockchain.utils.io.BytesSlice;
 

source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIED25519UtilsTest.java

@@ -1,123 +0,0 @@
-//package test.com.jd.blockchain.crypto.jniutils;
-//
-//import com.jd.blockchain.crypto.jniutils.asymmetric.JNIED25519Utils;
-//
-//
-//public class JNIED25519UtilsTest {
-//
-//    /* Program entry function */
-//    public static void main(String args[]) {
-//
-//        byte[] msg = "abc".getBytes();
-//        int i;
-//        int j;
-//        int count = 10000;
-//
-//        long startTS;
-//        long elapsedTS;
-//
-//        byte[] privKey   = new byte[32];
-//        byte[] pubKey    = new byte[32];
-//        byte[] signature;
-//
-//
-//        JNIED25519Utils ed25519 = new JNIED25519Utils();
-//
-//        System.out.println("=================== Key Generation test ===================");
-//        ed25519.generateKeyPair(privKey,pubKey);
-//        System.out.println("Private Key: ");
-//        for(i = 0; i < privKey.length; i++) {
-//            System.out.print(privKey[i] + " ");
-//            if((i+1)%8 == 0)
-//                System.out.println();
-//        }
-//        System.out.println();
-//        System.out.println("Public Key: ");
-//        for(i = 0; i < pubKey.length; i++) {
-//            System.out.print(pubKey[i] + " ");
-//            if((i+1)%8 == 0)
-//                System.out.println();
-//        }
-//        System.out.println();
-//
-//        System.out.println("=================== Public Key Retrieval test ===================");
-//        byte[] pk;
-//        pk = ed25519.getPubKey(privKey);
-//        System.out.println("Retrieved Public Key: ");
-//        for(i = 0; i < pk.length; i++) {
-//            System.out.print(pk[i] + " ");
-//            if((i+1)%8 == 0)
-//                System.out.println();
-//        }
-//        System.out.println();
-//
-//        System.out.println("=================== Signing test ===================");
-//        signature = ed25519.sign(msg,privKey,pubKey);
-//        System.out.println("Signature: ");
-//        for(i = 0; i < signature.length; i++) {
-//            System.out.print(signature[i] + " ");
-//            if((i+1)%8 == 0)
-//                System.out.println();
-//        }
-//        System.out.println();
-//
-//        System.out.println("=================== Verifying test ===================");
-//        if (ed25519.verify(msg,pubKey,signature))
-//            System.out.println("valid signature");
-//        else System.out.println("invalid signature");
-//
-//        System.out.println("=================== Do ED25519 Key Pair Generation Test ===================");
-//
-//
-//        for (j = 0; j < 5; j++) {
-//            System.out.println("------------- round[" + j + "] --------------");
-//            startTS = System.currentTimeMillis();
-//            for (i = 0; i < count; i++) {
-//                ed25519.generateKeyPair(privKey,pubKey);
-//            }
-//            elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("ED25519 Key Pair Generation: Count=%s; Elapsed Times=%s; TPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS));
-//        }
-//        System.out.println();
-//
-//        System.out.println("=================== Do ED25519 Public Key Retrieval Test ===================");
-//        for (j = 0; j < 5; j++) {
-//            System.out.println("------------- round[" + j + "] --------------");
-//            startTS = System.currentTimeMillis();
-//            for (i = 0; i < count; i++) {
-//                ed25519.getPubKey(privKey);
-//            }
-//            elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("ED25519 Public Key Retrieval: Count=%s; Elapsed Times=%s; TPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS));
-//        }
-//        System.out.println();
-//
-//        System.out.println("=================== Do ED25519 Signing Test ===================");
-//        for (j = 0; j < 5; j++) {
-//            System.out.println("------------- round[" + j + "] --------------");
-//            startTS = System.currentTimeMillis();
-//            for (i = 0; i < count; i++) {
-//                ed25519.sign(msg,privKey,pubKey);
-//            }
-//            elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("ED25519 Signing: Count=%s; Elapsed Times=%s; TPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS));
-//        }
-//        System.out.println();
-//
-//        System.out.println("=================== Do ED25519 Verifying Test ===================");
-//        for (j = 0; j < 5; j++) {
-//            System.out.println("------------- round[" + j + "] --------------");
-//            startTS = System.currentTimeMillis();
-//            for (i = 0; i < count; i++) {
-//                ed25519.verify(msg,pubKey,signature);
-//            }
-//            elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("ED25519 Verifying: Count=%s; Elapsed Times=%s; TPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS));
-//        }
-//        System.out.println();
-//    }
-//}

source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIMBSHA256UtilsTest.java

@@ -1,111 +0,0 @@
-//package test.com.jd.blockchain.crypto.jniutils;
-//
-//import com.jd.blockchain.crypto.jniutils.hash.JNIMBSHA256Utils;
-//
-//public class JNIMBSHA256UtilsTest {
-//    /* Program entry function */
-//    public static void main(String args[]) {
-//
-//        String osName = System.getProperty("os.name").toLowerCase();
-//
-//        if (! osName.contains("linux")) {
-//            return ;
-//        }
-//
-//        byte[] array1 = "abc".getBytes();
-//        byte[] array2 = "abcd".getBytes();
-//        byte[] array3 = "abcde".getBytes();
-//        byte[] array4 = "abcdef".getBytes();
-//
-//        byte[][] arrays = {array1,array2,array3,array4};
-//        JNIMBSHA256Utils mbsha256 = new JNIMBSHA256Utils();
-//        byte[][] results = mbsha256.multiBufferHash(arrays);
-//
-//        System.out.println("JAVA to C : ");
-//        for (int i = 0; i < arrays.length; i++) {
-//            for (int j = 0; j < arrays[i].length; j++) {
-//                System.out.print(arrays[i][j] + " ");
-//            }
-//            System.out.println();
-//        }
-//
-//        System.out.println();
-//
-//        System.out.println("C to JAVA : ");
-//        for (int i = 0; i < results.length; i++) {
-//            for (int j = 0; j < results[i].length; j++) {
-//                System.out.print(results[i][j] + " ");
-//            }
-//            System.out.println();
-//        }
-//
-//        System.out.println();
-//
-//        String str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
-//        byte[] array = str.getBytes();
-//
-//
-//        int count = 1000000;
-//
-//
-//        byte[][] arraysx4 = {array,array,array,array};
-//        byte[][] arraysx8 = {array,array,array,array,array,array,array,array};
-//        byte[][] arraysx16 = {array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array};
-//        byte[][] arraysx32 = {array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array,array};
-//
-//
-//        System.out.println("=================== do MBSHA256 hash test in x4===================");
-//        for (int r = 0; r < 5; r++) {
-//            System.out.println("------------- round[" + r + "] --------------");
-//            long startTS = System.currentTimeMillis();
-//            for (int i = 0; i < count; i++) {
-//                mbsha256.multiBufferHash(arraysx4);
-//            }
-//            long elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("SHA256 hashing Count=%s; Elapsed Times=%s; KBPS=%.2f;  Total KBPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS, (count * 1000.00D) / elapsedTS*4));
-//        }
-//        System.out.println();
-//        System.out.println();
-//
-//        System.out.println("=================== do MBSHA256 hash test in x8===================");
-//        for (int r = 0; r < 5; r++) {
-//            System.out.println("------------- round[" + r + "] --------------");
-//            long startTS = System.currentTimeMillis();
-//            for (int i = 0; i < count; i++) {
-//                mbsha256.multiBufferHash(arraysx8);
-//            }
-//            long elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("SHA256 hashing Count=%s; Elapsed Times=%s; KBPS=%.2f;  Total KBPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS, (count * 1000.00D) / elapsedTS*8));
-//        }
-//        System.out.println();
-//        System.out.println();
-//
-//        System.out.println("=================== do MBSHA256 hash test in x16===================");
-//        for (int r = 0; r < 5; r++) {
-//            System.out.println("------------- round[" + r + "] --------------");
-//            long startTS = System.currentTimeMillis();
-//            for (int i = 0; i < count; i++) {
-//                mbsha256.multiBufferHash(arraysx16);
-//            }
-//            long elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("SHA256 hashing Count=%s; Elapsed Times=%s; KBPS=%.2f;  Total KBPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS, (count * 1000.00D) / elapsedTS*16));
-//        }
-//        System.out.println();
-//        System.out.println();
-//
-//        System.out.println("=================== do MBSHA256 hash test in x32===================");
-//        for (int r = 0; r < 5; r++) {
-//            System.out.println("------------- round[" + r + "] --------------");
-//            long startTS = System.currentTimeMillis();
-//            for (int i = 0; i < count; i++) {
-//                mbsha256.multiBufferHash(arraysx32);
-//            }
-//            long elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("SHA256 hashing Count=%s; Elapsed Times=%s; KBPS=%.2f;  Total KBPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS, (count * 1000.00D) / elapsedTS*32));
-//        }
-//    }
-//}

source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIRIPEMD160UtilsTest.java

@@ -1,41 +0,0 @@
-//package test.com.jd.blockchain.crypto.jniutils;
-//
-//import com.jd.blockchain.crypto.jniutils.hash.JNIRIPEMD160Utils;
-//
-//public class JNIRIPEMD160UtilsTest {
-//
-//    /* Program entry function */
-//    public static void main(String args[]) {
-//        byte[] array1 = "abc".getBytes();
-//        byte[] array2;
-//        JNIRIPEMD160Utils ripemd160 = new JNIRIPEMD160Utils();
-//        array2 = ripemd160.hash(array1);
-//
-//        System.out.print("JAVA to C : ");
-//        for (byte anArray1 : array1) {
-//            System.out.print(anArray1 + " ");
-//        }
-//        System.out.println();
-//        System.out.print("C to JAVA : ");
-//        for (byte anArray2 : array2) {
-//            System.out.print(anArray2 + " ");
-//        }
-//        System.out.println();
-//
-//        String str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
-//        byte[] array = str.getBytes();
-//        int count = 1000000;
-//
-//        System.out.println("=================== do RIPEMD160 hash test ===================");
-//        for (int r = 0; r < 5; r++) {
-//            System.out.println("------------- round[" + r + "] --------------");
-//            long startTS = System.currentTimeMillis();
-//            for (int i = 0; i < count; i++) {
-//                ripemd160.hash(array);
-//            }
-//            long elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("RIPEMD160 hashing Count=%s; Elapsed Times=%s; KBPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS));
-//        }
-//    }
-//}

source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNISHA256UtilsTest.java

@@ -1,41 +0,0 @@
-//package test.com.jd.blockchain.crypto.jniutils;
-//
-//import com.jd.blockchain.crypto.jniutils.hash.JNISHA256Utils;
-//
-//public class JNISHA256UtilsTest {
-//
-//    /* Program entry function */
-//    public static void main(String args[]) {
-//        byte[] array1 = "abc".getBytes();
-//        byte[] array2;
-//        JNISHA256Utils sha256 = new JNISHA256Utils();
-//        array2 = sha256.hash(array1);
-//        System.out.print("JAVA to C : ");
-//        for (byte anArray1 : array1) {
-//            System.out.print(anArray1 + " ");
-//        }
-//        System.out.println();
-//        System.out.print("C to JAVA : ");
-//        for (byte anArray2 : array2) {
-//            System.out.print(anArray2 + " ");
-//        }
-//        System.out.println();
-//
-//
-//        String str = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
-//        byte[] array = str.getBytes();
-//        int count = 1000000;
-//
-//        System.out.println("=================== do SHA256 hash test ===================");
-//        for (int r = 0; r < 5; r++) {
-//            System.out.println("------------- round[" + r + "] --------------");
-//            long startTS = System.currentTimeMillis();
-//            for (int i = 0; i < count; i++) {
-//                sha256.hash(array);
-//            }
-//            long elapsedTS = System.currentTimeMillis() - startTS;
-//            System.out.println(String.format("SHA256 hashing Count=%s; Elapsed Times=%s; KBPS=%.2f", count, elapsedTS,
-//                    (count * 1000.00D) / elapsedTS));
-//        }
-//    }
-//}

source/crypto/crypto-sm/src/main/java/com/jd/blockchain/crypto/service/sm/SM2CryptoFunction.java

@@ -10,11 +10,6 @@ import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 
-import com.jd.blockchain.crypto.asymmetric.AsymmetricCiphertext;
-import com.jd.blockchain.crypto.asymmetric.AsymmetricEncryptionFunction;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
 import com.jd.blockchain.crypto.utils.sm.SM2Utils;
 
 public class SM2CryptoFunction implements AsymmetricEncryptionFunction, SignatureFunction {

source/crypto/crypto-sm/src/main/java/com/jd/blockchain/crypto/service/sm/SM3HashFunction.java

@@ -5,8 +5,8 @@ import java.util.Arrays;
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoBytes;
 import com.jd.blockchain.crypto.CryptoException;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.crypto.utils.sm.SM3Utils;
 
 public class SM3HashFunction implements HashFunction {

source/crypto/crypto-sm/src/main/java/com/jd/blockchain/crypto/service/sm/SM4EncryptionFunction.java

@@ -9,8 +9,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.crypto.symmetric.SymmetricCiphertext;
-import com.jd.blockchain.crypto.symmetric.SymmetricEncryptionFunction;
 import com.jd.blockchain.crypto.utils.sm.SM4Utils;
 
 public class SM4EncryptionFunction implements SymmetricEncryptionFunction {

source/crypto/crypto-sm/src/test/java/test/com/jd/blockchain/crypto/service/sm/SM2CyptoFunctionTest.java

@@ -1,10 +1,6 @@
 package test.com.jd.blockchain.crypto.service.sm;
 
 import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.crypto.asymmetric.AsymmetricEncryptionFunction;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/crypto/crypto-sm/src/test/java/test/com/jd/blockchain/crypto/service/sm/SM3HashFunctionTest.java

@@ -3,8 +3,8 @@ package test.com.jd.blockchain.crypto.service.sm;
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoException;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/crypto/crypto-sm/src/test/java/test/com/jd/blockchain/crypto/service/sm/SM4EncryptionFunctionTest.java

@@ -1,7 +1,6 @@
 package test.com.jd.blockchain.crypto.service.sm;
 
 import com.jd.blockchain.crypto.*;
-import com.jd.blockchain.crypto.symmetric.SymmetricEncryptionFunction;
 import com.jd.blockchain.utils.io.BytesUtils;
 import org.junit.Test;
 

source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java

@@ -11,9 +11,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
 import com.jd.blockchain.tools.keygen.KeyGenCommand;
 import com.jd.blockchain.utils.ArgumentSet;
 import com.jd.blockchain.utils.BaseConstant;

source/gateway/src/main/java/com/jd/blockchain/gateway/PeerConnector.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.gateway;
 
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.utils.net.NetworkAddress;
 
 import java.util.List;

source/gateway/src/main/java/com/jd/blockchain/gateway/service/GatewayQueryService.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.gateway.service;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.ParticipantNode;
 
 /**

source/gateway/src/main/java/com/jd/blockchain/gateway/service/GatewayQueryServiceImpl.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.gateway.service;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.gateway.PeerService;
 import com.jd.blockchain.ledger.ParticipantNode;
 import com.jd.blockchain.utils.QueryUtil;

source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java

@@ -4,7 +4,7 @@ import javax.annotation.PreDestroy;
 
 import org.springframework.stereotype.Component;
 
-import com.jd.blockchain.crypto.asymmetric.CryptoKeyPair;
+import com.jd.blockchain.crypto.CryptoKeyPair;
 import com.jd.blockchain.gateway.PeerConnector;
 import com.jd.blockchain.gateway.PeerService;
 import com.jd.blockchain.ledger.data.TransactionService;

source/gateway/src/main/java/com/jd/blockchain/gateway/web/BlockBrowserController.java

@@ -1,8 +1,8 @@
 package com.jd.blockchain.gateway.web;
 
 import com.jd.blockchain.crypto.AddressEncoding;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.gateway.PeerService;
 import com.jd.blockchain.gateway.service.DataRetrievalService;
 import com.jd.blockchain.gateway.service.GatewayQueryService;

source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayTimeTasks.java

@@ -9,7 +9,7 @@
 package com.jd.blockchain.gateway.web;
 
 import com.jd.blockchain.consensus.service.NodeServer;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.gateway.PeerConnector;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebServerConfigurer.java

@@ -11,9 +11,9 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 import com.jd.blockchain.crypto.serialize.ByteArrayObjectDeserializer;
 import com.jd.blockchain.crypto.serialize.ByteArrayObjectSerializer;
 import com.jd.blockchain.utils.Bytes;

source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.asymmetric.SignatureFunction;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.SignatureFunction;
 import com.jd.blockchain.gateway.PeerService;
 import com.jd.blockchain.ledger.DigitalSignature;
 import com.jd.blockchain.ledger.TransactionContent;

source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestDeserializer.java

@@ -5,7 +5,7 @@ import java.lang.reflect.Type;
 import com.alibaba.fastjson.parser.DefaultJSONParser;
 import com.alibaba.fastjson.parser.JSONToken;
 import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.utils.codec.Base58Utils;
 
 public class HashDigestDeserializer implements ObjectDeserializer{

source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestJSONSerializeTest.java

@@ -6,8 +6,8 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.utils.serialize.json.JSONSerializeUtils;
 
 public class HashDigestJSONSerializeTest {

source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestSerializer.java

@@ -6,7 +6,7 @@ import java.lang.reflect.Type;
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.ObjectSerializer;
 import com.alibaba.fastjson.serializer.SerializeWriter;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 
 public class HashDigestSerializer implements ObjectSerializer {
 	

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/AccountSet.java

@@ -8,8 +8,8 @@ import com.jd.blockchain.binaryproto.DConstructor;
 import com.jd.blockchain.binaryproto.DataContractRegistry;
 import com.jd.blockchain.binaryproto.FieldSetter;
 import com.jd.blockchain.crypto.AddressEncoding;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.ledger.LedgerTransaction;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/BaseAccount.java

@@ -1,7 +1,7 @@
 package com.jd.blockchain.ledger.core;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.ledger.BlockchainIdentity;
 import com.jd.blockchain.ledger.BlockchainIdentityData;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java

@@ -1,7 +1,7 @@
 package com.jd.blockchain.ledger.core;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.utils.Bytes;
 import com.jd.blockchain.utils.io.BytesUtils;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java

@@ -1,7 +1,7 @@
 package com.jd.blockchain.ledger.core;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.ledger.DigitalSignature;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java

@@ -1,8 +1,8 @@
 package com.jd.blockchain.ledger.core;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.ledger.BytesValue;
 import com.jd.blockchain.ledger.KVDataEntry;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java

@@ -1,7 +1,7 @@
 package com.jd.blockchain.ledger.core;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.ledger.DigitalSignature;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminAccount.java

@@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory;
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.binaryproto.DataContractRegistry;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.ledger.LedgerInitSetting;
 import com.jd.blockchain.ledger.ParticipantNode;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitDecision.java

@@ -3,8 +3,8 @@ package com.jd.blockchain.ledger.core;
 import com.jd.blockchain.binaryproto.DataContract;
 import com.jd.blockchain.binaryproto.DataField;
 import com.jd.blockchain.consts.TypeCodes;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 import com.jd.blockchain.utils.ValueType;
 
 /**

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitPermission.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.ledger.core;
 import com.jd.blockchain.binaryproto.DataContract;
 import com.jd.blockchain.binaryproto.DataField;
 import com.jd.blockchain.consts.TypeCodes;
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 import com.jd.blockchain.ledger.LedgerInitOperation;
 import com.jd.blockchain.utils.ValueType;
 

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerInitPermissionData.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.asymmetric.SignatureDigest;
+import com.jd.blockchain.crypto.SignatureDigest;
 
 public class LedgerInitPermissionData implements LedgerInitPermission {
 

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerManage.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerInitSetting;
 import com.jd.blockchain.storage.service.KVStorageService;
 

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerMetadata.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.ledger.core;
 import com.jd.blockchain.binaryproto.DataContract;
 import com.jd.blockchain.binaryproto.DataField;
 import com.jd.blockchain.consts.TypeCodes;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.utils.ValueType;
 
 @DataContract(code = TypeCodes.METADATA)

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerRepository.java

@@ -2,7 +2,7 @@ package com.jd.blockchain.ledger.core;
 
 import java.io.Closeable;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerBlock;
 
 public interface LedgerRepository extends Closeable {

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerService.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 
 /**
  * 账本管理器；

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage.ExPolicy;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleNode.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 
 public interface MerkleNode {
 

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleProof.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 
 public interface MerkleProof {
 

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleProvable.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.utils.Bytes;
 
 public interface MerkleProvable {

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleTree.java

@@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import com.jd.blockchain.crypto.CryptoAlgorithm;
 import com.jd.blockchain.crypto.CryptoUtils;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage.ExPolicy;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataSet.java

@@ -2,7 +2,7 @@ package com.jd.blockchain.ledger.core;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.binaryproto.DataContractRegistry;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.ParticipantNode;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionSet.java

@@ -2,7 +2,7 @@ package com.jd.blockchain.ledger.core;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.binaryproto.DataContractRegistry;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.ledger.LedgerTransaction;
 import com.jd.blockchain.ledger.TransactionState;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java

@@ -1,8 +1,8 @@
 package com.jd.blockchain.ledger.core;
 
 import com.jd.blockchain.crypto.CryptoUtils;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.UserInfo;
 import com.jd.blockchain.utils.Bytes;
 import com.jd.blockchain.utils.io.BytesUtils;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java

@@ -1,7 +1,7 @@
 package com.jd.blockchain.ledger.core;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.AccountHeader;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.storage.service.ExPolicyKVStorage;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerBlockData.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.ledger.core.impl;
 import com.jd.blockchain.binaryproto.DConstructor;
 import com.jd.blockchain.binaryproto.DataContractRegistry;
 import com.jd.blockchain.binaryproto.FieldSetter;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerBlock;
 
 public class LedgerBlockData implements LedgerBlock {

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerManager.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.ledger.core.impl;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerInitSetting;
 import com.jd.blockchain.ledger.core.LedgerConsts;
 import com.jd.blockchain.ledger.core.LedgerEditor;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerQueryService.java

@@ -1,7 +1,7 @@
 package com.jd.blockchain.ledger.core.impl;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.*;
 import com.jd.blockchain.ledger.core.*;
 import com.jd.blockchain.sdk.BlockchainQueryService;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerRepositoryImpl.java

@@ -3,8 +3,8 @@ package com.jd.blockchain.ledger.core.impl;
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
 import com.jd.blockchain.crypto.CryptoUtils;
-import com.jd.blockchain.crypto.hash.HashDigest;
-import com.jd.blockchain.crypto.hash.HashFunction;
+import com.jd.blockchain.crypto.HashDigest;
+import com.jd.blockchain.crypto.HashFunction;
 import com.jd.blockchain.ledger.BlockBody;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.ledger.LedgerBlock;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerTransactionData.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core.impl;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.DigitalSignature;
 import com.jd.blockchain.ledger.LedgerTransaction;
 import com.jd.blockchain.ledger.TransactionContent;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerTransactionalEditor.java

@@ -4,7 +4,7 @@ import java.util.Stack;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.crypto.CryptoServiceProviders;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.BlockBody;
 import com.jd.blockchain.ledger.CryptoSetting;
 import com.jd.blockchain.ledger.LedgerBlock;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java

@@ -7,7 +7,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerBlock;
 import com.jd.blockchain.ledger.Operation;
 import com.jd.blockchain.ledger.TransactionRequest;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionEngineImpl.java

@@ -3,10 +3,10 @@ package com.jd.blockchain.ledger.core.impl;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerBlock;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.ledger.core.LedgerDataSet;
 import com.jd.blockchain.ledger.core.LedgerEditor;
 import com.jd.blockchain.ledger.core.LedgerRepository;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionStagedSnapshot.java

@@ -1,6 +1,6 @@
 package com.jd.blockchain.ledger.core.impl;
 
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerDataSnapshot;
 
 public class TransactionStagedSnapshot implements LedgerDataSnapshot {

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.alibaba.fastjson.JSON;
 import com.jd.blockchain.contract.model.LedgerContext;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.*;
 import com.jd.blockchain.ledger.core.impl.OperationHandleContext;
 import com.jd.blockchain.ledger.data.DataAccountKVSetOperationBuilder;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockDeserializer.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.ledger.core.serialize;
 import com.alibaba.fastjson.parser.DefaultJSONParser;
 import com.alibaba.fastjson.parser.JSONToken;
 import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.utils.codec.Base58Utils;
 
 import java.lang.reflect.Type;

source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/serialize/LedgerBlockSerializer.java

@@ -3,7 +3,7 @@ package com.jd.blockchain.ledger.core.serialize;
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.ObjectSerializer;
 import com.alibaba.fastjson.serializer.SerializeWriter;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.ledger.LedgerBlock;
 
 import java.lang.reflect.Type;

source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/AccountSetTest.java

@@ -7,7 +7,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.jd.blockchain.crypto.CryptoAlgorithm;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.service.classic.ClassicCryptoService;
 import com.jd.blockchain.ledger.BlockchainKeyGenerator;
 import com.jd.blockchain.ledger.BlockchainKeyPair;

source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAccountTest.java

@@ -2,8 +2,8 @@ package test.com.jd.blockchain.ledger;
 
 import com.jd.blockchain.binaryproto.BinaryEncodingUtils;
 import com.jd.blockchain.binaryproto.DataContractRegistry;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.crypto.hash.HashDigest;
 import com.jd.blockchain.crypto.service.classic.ClassicCryptoService;
 import com.jd.blockchain.crypto.service.sm.SMCryptoService;
 import com.jd.blockchain.ledger.AccountHeader;

source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java

@@ -13,7 +13,7 @@ import org.junit.Test;
 
 import com.jd.blockchain.crypto.AddressEncoding;
 import com.jd.blockchain.crypto.CryptoAlgorithm;
-import com.jd.blockchain.crypto.hash.HashDigest;
+import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.service.classic.ClassicCryptoService;
 import com.jd.blockchain.ledger.BlockchainKeyGenerator;
 import com.jd.blockchain.ledger.BlockchainKeyPair;