Fixed some errors of test cases;

source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java

@@ -8,19 +8,41 @@
  */
 package com.jd.blockchain.sdk.converters;
 
+import java.lang.reflect.Field;
+
+import org.apache.commons.codec.binary.Base64;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jd.blockchain.crypto.CryptoProvider;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.ledger.*;
-import com.jd.blockchain.transaction.*;
+import com.jd.blockchain.ledger.BlockchainIdentityData;
+import com.jd.blockchain.ledger.BytesData;
+import com.jd.blockchain.ledger.BytesValue;
+import com.jd.blockchain.ledger.BytesValueEncoding;
+import com.jd.blockchain.ledger.ContractCodeDeployOperation;
+import com.jd.blockchain.ledger.ContractEventSendOperation;
+import com.jd.blockchain.ledger.CryptoSetting;
+import com.jd.blockchain.ledger.DataAccountKVSetOperation;
+import com.jd.blockchain.ledger.DataAccountRegisterOperation;
+import com.jd.blockchain.ledger.DataType;
+import com.jd.blockchain.ledger.KVDataEntry;
+import com.jd.blockchain.ledger.LedgerInitOperation;
+import com.jd.blockchain.ledger.Operation;
+import com.jd.blockchain.ledger.ParticipantNode;
+import com.jd.blockchain.ledger.UserRegisterOperation;
+import com.jd.blockchain.transaction.ContractCodeDeployOpTemplate;
+import com.jd.blockchain.transaction.ContractEventSendOpTemplate;
+import com.jd.blockchain.transaction.DataAccountKVSetOpTemplate;
+import com.jd.blockchain.transaction.DataAccountRegisterOpTemplate;
+import com.jd.blockchain.transaction.KVData;
+import com.jd.blockchain.transaction.LedgerInitData;
+import com.jd.blockchain.transaction.LedgerInitOpTemplate;
+import com.jd.blockchain.transaction.UserRegisterOpTemplate;
 import com.jd.blockchain.utils.Bytes;
 import com.jd.blockchain.utils.codec.Base58Utils;
 import com.jd.blockchain.utils.codec.HexUtils;
 import com.jd.blockchain.utils.io.BytesUtils;
-import org.apache.commons.codec.binary.Base64;
-
-import java.lang.reflect.Field;
 
 /**
  *
@@ -31,349 +53,350 @@ import java.lang.reflect.Field;
 
 public class ClientResolveUtil {
 
-    public static KVDataEntry[] read(KVDataEntry[] kvDataEntries) {
-        if (kvDataEntries == null || kvDataEntries.length == 0) {
-            return kvDataEntries;
-        }
-        KVDataEntry[] resolveKvDataEntries = new KVDataEntry[kvDataEntries.length];
-        // kvDataEntries是代理对象，需要处理
-        for (int i = 0; i < kvDataEntries.length; i++) {
-            KVDataEntry kvDataEntry = kvDataEntries[i];
-            String key = kvDataEntry.getKey();
-            long version = kvDataEntry.getVersion();
-            DataType dataType = kvDataEntry.getType();
-            KvData innerKvData = new KvData(key, version, dataType);
-            Object valueObj = kvDataEntry.getValue();
-            switch (dataType) {
-                case NIL:
-                    break;
-                case BYTES:
-                case TEXT:
-                case JSON:
-                case XML:
-                    innerKvData.setValue(valueObj.toString());
-                    break;
-                case INT32:
-                    innerKvData.setValue(Integer.parseInt(valueObj.toString()));
-                    break;
-                case INT64:
-                    innerKvData.setValue(Long.parseLong(valueObj.toString()));
-                    break;
-                default:
-                    throw new IllegalStateException("Unsupported value type[" + dataType + "] to resolve!");
-            }
-            resolveKvDataEntries[i] = innerKvData;
-        }
-        return resolveKvDataEntries;
-    }
-
-    public static Operation read(Operation operation) {
-
-        try {
-            // Class
-            Class<?> clazz = operation.getClass();
-            Field field = clazz.getSuperclass().getDeclaredField("h");
-            field.setAccessible(true);
-            Object object = field.get(operation);
-            if (object instanceof JSONObject) {
-                JSONObject jsonObject = (JSONObject) object;
-                if (jsonObject.containsKey("accountID")) {
-                    return convertDataAccountRegisterOperation(jsonObject);
-                } else if (jsonObject.containsKey("userID")) {
-                    return convertUserRegisterOperation(jsonObject);
-                } else if (jsonObject.containsKey("contractID")) {
-                    return convertContractCodeDeployOperation(jsonObject);
-                } else if (jsonObject.containsKey("writeSet")) {
-                    return convertDataAccountKVSetOperation(jsonObject);
-                } else if (jsonObject.containsKey("initSetting")) {
-                    return convertLedgerInitOperation(jsonObject);
-                } else if (jsonObject.containsKey("contractAddress")) {
-                    return convertContractEventSendOperation(jsonObject);
-                }
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return null;
-    }
-
-    public static Object readValueByBytesValue(BytesValue bytesValue) {
-        DataType dataType = bytesValue.getType();
-        Bytes saveVal = bytesValue.getValue();
-        Object showVal;
-        switch (dataType) {
-            case BYTES:
-                // return hex
-                showVal = HexUtils.encode(saveVal.toBytes());
-                break;
-            case TEXT:
-            case JSON:
-                showVal = saveVal.toUTF8String();
-                break;
-            case INT64:
-                showVal = BytesUtils.toLong(saveVal.toBytes());
-                break;
-            default:
-                showVal = HexUtils.encode(saveVal.toBytes());
-                break;
-        }
-        return showVal;
-    }
-
-    public static DataAccountRegisterOperation convertDataAccountRegisterOperation(JSONObject jsonObject) {
-        JSONObject account = jsonObject.getJSONObject("accountID");
-        return new DataAccountRegisterOpTemplate(blockchainIdentity(account));
-    }
-
-    public static DataAccountKVSetOperation convertDataAccountKVSetOperation(JSONObject jsonObject) {
-        // 写入集合处理
-        JSONArray writeSetObj = jsonObject.getJSONArray("writeSet");
-        JSONObject accountAddrObj = jsonObject.getJSONObject("accountAddress");
-        String addressBase58 = accountAddrObj.getString("value");
-        Bytes address = Bytes.fromBase58(addressBase58);
-
-        DataAccountKVSetOpTemplate kvOperation = new DataAccountKVSetOpTemplate(address);
-        for (int i = 0; i <writeSetObj.size(); i++) {
-            JSONObject currWriteSetObj = writeSetObj.getJSONObject(i);
-            long expectedVersion = currWriteSetObj.getLong("expectedVersion");
-            JSONObject valueObj = currWriteSetObj.getJSONObject("value");
-            String typeStr = valueObj.getString("type");
-            // Base58Utils.decode(valueObj.getJSONObject("value").getString("value"))
-            String realValBase58 = valueObj.getJSONObject("value").getString("value");
-            String key = currWriteSetObj.getString("key");
-            DataType dataType = DataType.valueOf(typeStr);
-            BytesValue bytesValue = BytesData.fromType(dataType, Base58Utils.decode(realValBase58));
-            KVData kvData = new KVData(key, bytesValue, expectedVersion);
-            kvOperation.set(kvData);
-        }
-
-        return kvOperation;
-    }
-
-    public static LedgerInitOperation convertLedgerInitOperation(JSONObject jsonObject) {
-        JSONObject legerInitObj = jsonObject.getJSONObject("initSetting");
-        LedgerInitSettingData ledgerInitSettingData = new LedgerInitSettingData();
-        String ledgerSeedStr = legerInitObj.getString("ledgerSeed");
-
-        // 种子需要做Base64转换
-        ledgerInitSettingData.setLedgerSeed(Base64.decodeBase64(BytesUtils.toBytes(ledgerSeedStr)));
-
-        String consensusProvider = legerInitObj.getString("consensusProvider");
-
-        ledgerInitSettingData.setConsensusProvider(consensusProvider);
-
-        JSONObject cryptoSettingObj = legerInitObj.getJSONObject("cryptoSetting");
-        boolean autoVerifyHash = cryptoSettingObj.getBoolean("autoVerifyHash");
-        short hashAlgorithm = cryptoSettingObj.getShort("hashAlgorithm");
-
-        CryptoConfig cryptoConfig = new CryptoConfig();
-
-        cryptoConfig.setAutoVerifyHash(autoVerifyHash);
-
-        cryptoConfig.setHashAlgorithm(hashAlgorithm);
-
-        ledgerInitSettingData.setCryptoSetting(cryptoConfig);
-
-
-        JSONObject consensusSettingsObj = legerInitObj.getJSONObject("consensusSettings");
-        Bytes consensusSettings = Bytes.fromBase58(consensusSettingsObj.getString("value"));
-
-        ledgerInitSettingData.setConsensusSettings(consensusSettings);
-
-        JSONArray consensusParticipantsArray = legerInitObj.getJSONArray("consensusParticipants");
-
-        if (!consensusParticipantsArray.isEmpty()) {
-            ParticipantNode[] participantNodes = new ParticipantNode[consensusParticipantsArray.size()];
-            for (int i = 0; i < consensusParticipantsArray.size(); i++) {
-                JSONObject currConsensusParticipant = consensusParticipantsArray.getJSONObject(i);
-                String addressBase58 = currConsensusParticipant.getString("address");
-                String name = currConsensusParticipant.getString("name");
-                int id = currConsensusParticipant.getInteger("id");
-                JSONObject pubKeyObj = currConsensusParticipant.getJSONObject("pubKey");
-                String pubKeyBase58 = pubKeyObj.getString("value");
-                // 生成ParticipantNode对象
-                ParticipantCertData participantCertData = new ParticipantCertData(id, addressBase58, name, new PubKey(Bytes.fromBase58(pubKeyBase58).toBytes()));
-                participantNodes[i] = participantCertData;
-            }
-            ledgerInitSettingData.setConsensusParticipants(participantNodes);
-        }
-
-        return new LedgerInitOpTemplate(ledgerInitSettingData);
-    }
-
-    public static UserRegisterOperation convertUserRegisterOperation(JSONObject jsonObject) {
-        JSONObject user = jsonObject.getJSONObject("userID");
-        return new UserRegisterOpTemplate(blockchainIdentity(user));
-    }
-
-    public static ContractCodeDeployOperation convertContractCodeDeployOperation(JSONObject jsonObject) {
-        JSONObject contract = jsonObject.getJSONObject("contractID");
-        BlockchainIdentityData blockchainIdentity = blockchainIdentity(contract);
-
-        String chainCodeStr = jsonObject.getString("chainCode");
-        ContractCodeDeployOpTemplate contractCodeDeployOpTemplate = new ContractCodeDeployOpTemplate(blockchainIdentity, BytesUtils.toBytes(chainCodeStr));
-        return contractCodeDeployOpTemplate;
-    }
-
-    public static ContractEventSendOperation convertContractEventSendOperation(JSONObject jsonObject) {
-        JSONObject contractAddressObj = jsonObject.getJSONObject("contractAddress");
-        String contractAddress = contractAddressObj.getString("value");
-        String argsStr = jsonObject.getString("args");
-        String event = jsonObject.getString("event");
-        return new ContractEventSendOpTemplate(Bytes.fromBase58(contractAddress), event,
-                BytesValueEncoding.encodeArray(new Object[]{argsStr}, null));
-    }
-
-    private static BlockchainIdentityData blockchainIdentity(JSONObject jsonObject) {
-        JSONObject addressObj = jsonObject.getJSONObject("address");
-        // base58值
-        String addressBase58 = addressObj.getString("value");
-        Bytes address = Bytes.fromBase58(addressBase58);
-
-        JSONObject pubKeyObj = jsonObject.getJSONObject("pubKey");
-        // base58值
-        String pubKeyBase58 = pubKeyObj.getString("value");
-        PubKey pubKey = new PubKey(Bytes.fromBase58(pubKeyBase58).toBytes());
-
-        // 生成对应的对象
-        return new BlockchainIdentityData(address, pubKey);
-    }
-
-    public static class CryptoConfig implements CryptoSetting {
-
-        private short hashAlgorithm;
-
-        private boolean autoVerifyHash;
-
-        @Override
-        public CryptoProvider[] getSupportedProviders() {
-            return new CryptoProvider[0];
-        }
-
-        @Override
-        public short getHashAlgorithm() {
-            return hashAlgorithm;
-        }
-
-        @Override
-        public boolean getAutoVerifyHash() {
-            return autoVerifyHash;
-        }
-
-        public void setHashAlgorithm(short hashAlgorithm) {
-            this.hashAlgorithm = hashAlgorithm;
-        }
-
-        public void setAutoVerifyHash(boolean autoVerifyHash) {
-            this.autoVerifyHash = autoVerifyHash;
-        }
-    }
-
-    public static class ParticipantCertData implements ParticipantNode{
-        private int id;
-        private String address;
-        private String name;
-        private PubKey pubKey;
-
-        public ParticipantCertData() {
-        }
-
-        public ParticipantCertData(ParticipantNode participantNode) {
-            this.address = participantNode.getAddress();
-            this.name = participantNode.getName();
-            this.pubKey = participantNode.getPubKey();
-        }
-
-        public ParticipantCertData(int id, String address, String name, PubKey pubKey) {
-            this.id = id;
-            this.address = address;
-            this.name = name;
-            this.pubKey = pubKey;
-        }
-
-        @Override
-        public String getAddress() {
-            return address;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public PubKey getPubKey() {
-            return pubKey;
-        }
-
-        public int getId() {
-            return id;
-        }
-
-        public void setId(int id) {
-            this.id = id;
-        }
-    }
-
-    public static class KvData implements KVDataEntry {
-
-        private String key;
-
-        private long version;
-
-        private DataType dataType;
-
-        private Object value;
-
-        public KvData() {
-        }
-
-        public KvData(String key, long version, DataType dataType) {
-            this(key, version, dataType, null);
-        }
-
-        public KvData(String key, long version, DataType dataType, Object value) {
-            this.key = key;
-            this.version = version;
-            this.dataType = dataType;
-            this.value = value;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public void setVersion(long version) {
-            this.version = version;
-        }
-
-        public void setDataType(DataType dataType) {
-            this.dataType = dataType;
-        }
-
-        public void setValue(Object value) {
-            this.value = value;
-        }
-
-        @Override
-        public String getKey() {
-            return key;
-        }
-
-        @Override
-        public long getVersion() {
-            return version;
-        }
-
-        @Override
-        public DataType getType() {
-            return dataType;
-        }
-
-        @Override
-        public Object getValue() {
-            return value;
-        }
-    }
+	public static KVDataEntry[] read(KVDataEntry[] kvDataEntries) {
+		if (kvDataEntries == null || kvDataEntries.length == 0) {
+			return kvDataEntries;
+		}
+		KVDataEntry[] resolveKvDataEntries = new KVDataEntry[kvDataEntries.length];
+		// kvDataEntries是代理对象，需要处理
+		for (int i = 0; i < kvDataEntries.length; i++) {
+			KVDataEntry kvDataEntry = kvDataEntries[i];
+			String key = kvDataEntry.getKey();
+			long version = kvDataEntry.getVersion();
+			DataType dataType = kvDataEntry.getType();
+			KvData innerKvData = new KvData(key, version, dataType);
+			Object valueObj = kvDataEntry.getValue();
+			switch (dataType) {
+			case NIL:
+				break;
+			case BYTES:
+			case TEXT:
+			case JSON:
+			case XML:
+				innerKvData.setValue(valueObj.toString());
+				break;
+			case INT32:
+				innerKvData.setValue(Integer.parseInt(valueObj.toString()));
+				break;
+			case INT64:
+				innerKvData.setValue(Long.parseLong(valueObj.toString()));
+				break;
+			default:
+				throw new IllegalStateException("Unsupported value type[" + dataType + "] to resolve!");
+			}
+			resolveKvDataEntries[i] = innerKvData;
+		}
+		return resolveKvDataEntries;
+	}
+
+	public static Operation read(Operation operation) {
+
+		try {
+			// Class
+			Class<?> clazz = operation.getClass();
+			Field field = clazz.getSuperclass().getDeclaredField("h");
+			field.setAccessible(true);
+			Object object = field.get(operation);
+			if (object instanceof JSONObject) {
+				JSONObject jsonObject = (JSONObject) object;
+				if (jsonObject.containsKey("accountID")) {
+					return convertDataAccountRegisterOperation(jsonObject);
+				} else if (jsonObject.containsKey("userID")) {
+					return convertUserRegisterOperation(jsonObject);
+				} else if (jsonObject.containsKey("contractID")) {
+					return convertContractCodeDeployOperation(jsonObject);
+				} else if (jsonObject.containsKey("writeSet")) {
+					return convertDataAccountKVSetOperation(jsonObject);
+				} else if (jsonObject.containsKey("initSetting")) {
+					return convertLedgerInitOperation(jsonObject);
+				} else if (jsonObject.containsKey("contractAddress")) {
+					return convertContractEventSendOperation(jsonObject);
+				}
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+
+		return null;
+	}
+
+	public static Object readValueByBytesValue(BytesValue bytesValue) {
+		DataType dataType = bytesValue.getType();
+		Bytes saveVal = bytesValue.getValue();
+		Object showVal;
+		switch (dataType) {
+		case BYTES:
+			// return hex
+			showVal = HexUtils.encode(saveVal.toBytes());
+			break;
+		case TEXT:
+		case JSON:
+			showVal = saveVal.toUTF8String();
+			break;
+		case INT64:
+			showVal = BytesUtils.toLong(saveVal.toBytes());
+			break;
+		default:
+			showVal = HexUtils.encode(saveVal.toBytes());
+			break;
+		}
+		return showVal;
+	}
+
+	public static DataAccountRegisterOperation convertDataAccountRegisterOperation(JSONObject jsonObject) {
+		JSONObject account = jsonObject.getJSONObject("accountID");
+		return new DataAccountRegisterOpTemplate(blockchainIdentity(account));
+	}
+
+	public static DataAccountKVSetOperation convertDataAccountKVSetOperation(JSONObject jsonObject) {
+		// 写入集合处理
+		JSONArray writeSetObj = jsonObject.getJSONArray("writeSet");
+		JSONObject accountAddrObj = jsonObject.getJSONObject("accountAddress");
+		String addressBase58 = accountAddrObj.getString("value");
+		Bytes address = Bytes.fromBase58(addressBase58);
+
+		DataAccountKVSetOpTemplate kvOperation = new DataAccountKVSetOpTemplate(address);
+		for (int i = 0; i < writeSetObj.size(); i++) {
+			JSONObject currWriteSetObj = writeSetObj.getJSONObject(i);
+			long expectedVersion = currWriteSetObj.getLong("expectedVersion");
+			JSONObject valueObj = currWriteSetObj.getJSONObject("value");
+			String typeStr = valueObj.getString("type");
+			// Base58Utils.decode(valueObj.getJSONObject("value").getString("value"))
+			String realValBase58 = valueObj.getJSONObject("value").getString("value");
+			String key = currWriteSetObj.getString("key");
+			DataType dataType = DataType.valueOf(typeStr);
+			BytesValue bytesValue = BytesData.fromType(dataType, Base58Utils.decode(realValBase58));
+			KVData kvData = new KVData(key, bytesValue, expectedVersion);
+			kvOperation.set(kvData);
+		}
+
+		return kvOperation;
+	}
+
+	public static LedgerInitOperation convertLedgerInitOperation(JSONObject jsonObject) {
+		JSONObject legerInitObj = jsonObject.getJSONObject("initSetting");
+		LedgerInitData ledgerInitSettingData = new LedgerInitData();
+		String ledgerSeedStr = legerInitObj.getString("ledgerSeed");
+
+		// 种子需要做Base64转换
+		ledgerInitSettingData.setLedgerSeed(Base64.decodeBase64(BytesUtils.toBytes(ledgerSeedStr)));
+
+		String consensusProvider = legerInitObj.getString("consensusProvider");
+
+		ledgerInitSettingData.setConsensusProvider(consensusProvider);
+
+		JSONObject cryptoSettingObj = legerInitObj.getJSONObject("cryptoSetting");
+		boolean autoVerifyHash = cryptoSettingObj.getBoolean("autoVerifyHash");
+		short hashAlgorithm = cryptoSettingObj.getShort("hashAlgorithm");
+
+		CryptoConfig cryptoConfig = new CryptoConfig();
+
+		cryptoConfig.setAutoVerifyHash(autoVerifyHash);
+
+		cryptoConfig.setHashAlgorithm(hashAlgorithm);
+
+		ledgerInitSettingData.setCryptoSetting(cryptoConfig);
+
+		JSONObject consensusSettingsObj = legerInitObj.getJSONObject("consensusSettings");
+		Bytes consensusSettings = Bytes.fromBase58(consensusSettingsObj.getString("value"));
+
+		ledgerInitSettingData.setConsensusSettings(consensusSettings);
+
+		JSONArray consensusParticipantsArray = legerInitObj.getJSONArray("consensusParticipants");
+
+		if (!consensusParticipantsArray.isEmpty()) {
+			ParticipantNode[] participantNodes = new ParticipantNode[consensusParticipantsArray.size()];
+			for (int i = 0; i < consensusParticipantsArray.size(); i++) {
+				JSONObject currConsensusParticipant = consensusParticipantsArray.getJSONObject(i);
+				Bytes address = Bytes.fromBase58(currConsensusParticipant.getString("address"));
+				String name = currConsensusParticipant.getString("name");
+				int id = currConsensusParticipant.getInteger("id");
+				JSONObject pubKeyObj = currConsensusParticipant.getJSONObject("pubKey");
+				String pubKeyBase58 = pubKeyObj.getString("value");
+				// 生成ParticipantNode对象
+				ParticipantCertData participantCertData = new ParticipantCertData(id, address, name,
+						new PubKey(Bytes.fromBase58(pubKeyBase58).toBytes()));
+				participantNodes[i] = participantCertData;
+			}
+			ledgerInitSettingData.setConsensusParticipants(participantNodes);
+		}
+
+		return new LedgerInitOpTemplate(ledgerInitSettingData);
+	}
+
+	public static UserRegisterOperation convertUserRegisterOperation(JSONObject jsonObject) {
+		JSONObject user = jsonObject.getJSONObject("userID");
+		return new UserRegisterOpTemplate(blockchainIdentity(user));
+	}
+
+	public static ContractCodeDeployOperation convertContractCodeDeployOperation(JSONObject jsonObject) {
+		JSONObject contract = jsonObject.getJSONObject("contractID");
+		BlockchainIdentityData blockchainIdentity = blockchainIdentity(contract);
+
+		String chainCodeStr = jsonObject.getString("chainCode");
+		ContractCodeDeployOpTemplate contractCodeDeployOpTemplate = new ContractCodeDeployOpTemplate(blockchainIdentity,
+				BytesUtils.toBytes(chainCodeStr));
+		return contractCodeDeployOpTemplate;
+	}
+
+	public static ContractEventSendOperation convertContractEventSendOperation(JSONObject jsonObject) {
+		JSONObject contractAddressObj = jsonObject.getJSONObject("contractAddress");
+		String contractAddress = contractAddressObj.getString("value");
+		String argsStr = jsonObject.getString("args");
+		String event = jsonObject.getString("event");
+		return new ContractEventSendOpTemplate(Bytes.fromBase58(contractAddress), event,
+				BytesValueEncoding.encodeArray(new Object[] { argsStr }, null));
+	}
+
+	private static BlockchainIdentityData blockchainIdentity(JSONObject jsonObject) {
+		JSONObject addressObj = jsonObject.getJSONObject("address");
+		// base58值
+		String addressBase58 = addressObj.getString("value");
+		Bytes address = Bytes.fromBase58(addressBase58);
+
+		JSONObject pubKeyObj = jsonObject.getJSONObject("pubKey");
+		// base58值
+		String pubKeyBase58 = pubKeyObj.getString("value");
+		PubKey pubKey = new PubKey(Bytes.fromBase58(pubKeyBase58).toBytes());
+
+		// 生成对应的对象
+		return new BlockchainIdentityData(address, pubKey);
+	}
+
+	public static class CryptoConfig implements CryptoSetting {
+
+		private short hashAlgorithm;
+
+		private boolean autoVerifyHash;
+
+		@Override
+		public CryptoProvider[] getSupportedProviders() {
+			return new CryptoProvider[0];
+		}
+
+		@Override
+		public short getHashAlgorithm() {
+			return hashAlgorithm;
+		}
+
+		@Override
+		public boolean getAutoVerifyHash() {
+			return autoVerifyHash;
+		}
+
+		public void setHashAlgorithm(short hashAlgorithm) {
+			this.hashAlgorithm = hashAlgorithm;
+		}
+
+		public void setAutoVerifyHash(boolean autoVerifyHash) {
+			this.autoVerifyHash = autoVerifyHash;
+		}
+	}
+
+	public static class ParticipantCertData implements ParticipantNode {
+		private int id;
+		private Bytes address;
+		private String name;
+		private PubKey pubKey;
+
+		public ParticipantCertData() {
+		}
+
+		public ParticipantCertData(ParticipantNode participantNode) {
+			this.address = participantNode.getAddress();
+			this.name = participantNode.getName();
+			this.pubKey = participantNode.getPubKey();
+		}
+
+		public ParticipantCertData(int id, Bytes address, String name, PubKey pubKey) {
+			this.id = id;
+			this.address = address;
+			this.name = name;
+			this.pubKey = pubKey;
+		}
+
+		@Override
+		public Bytes getAddress() {
+			return address;
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public PubKey getPubKey() {
+			return pubKey;
+		}
+
+		public int getId() {
+			return id;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+	}
+
+	public static class KvData implements KVDataEntry {
+
+		private String key;
+
+		private long version;
+
+		private DataType dataType;
+
+		private Object value;
+
+		public KvData() {
+		}
+
+		public KvData(String key, long version, DataType dataType) {
+			this(key, version, dataType, null);
+		}
+
+		public KvData(String key, long version, DataType dataType, Object value) {
+			this.key = key;
+			this.version = version;
+			this.dataType = dataType;
+			this.value = value;
+		}
+
+		public void setKey(String key) {
+			this.key = key;
+		}
+
+		public void setVersion(long version) {
+			this.version = version;
+		}
+
+		public void setDataType(DataType dataType) {
+			this.dataType = dataType;
+		}
+
+		public void setValue(Object value) {
+			this.value = value;
+		}
+
+		@Override
+		public String getKey() {
+			return key;
+		}
+
+		@Override
+		public long getVersion() {
+			return version;
+		}
+
+		@Override
+		public DataType getType() {
+			return dataType;
+		}
+
+		@Override
+		public Object getValue() {
+			return value;
+		}
+	}
 }

source/test/test-integration/src/test/resources/ledger_init_test.init

@@ -3,7 +3,7 @@
 ledger.seed=932dfe23-fe23232f-283f32fa-dd32aa76-8322ca2f-56236cda-7136b322-cb323ffe
 
 #账本的描述名称；此属性不参与共识，仅仅在当前参与方的本地节点用于描述用途；
-ledger.name=
+ledger.name=TEST-LEDGER
 
 #声明的账本创建时间；格式为 “yyyy-MM-dd HH:mm:ss.SSSZ”，表示”年-月-日 时:分:秒:毫秒时区“；例如：“2019-08-01 14:26:58.069+0800”，其中，+0800 表示时区是东8区
 created-time=2019-08-01 14:26:58.069+0800

source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitCommand.java

@@ -2,8 +2,6 @@ package com.jd.blockchain.tools.initializer;
 
 import java.io.File;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -16,7 +14,7 @@ import com.jd.blockchain.crypto.AddressEncoding;
 import com.jd.blockchain.crypto.HashDigest;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.ledger.core.impl.LedgerManager;
+import com.jd.blockchain.ledger.core.LedgerManager;
 import com.jd.blockchain.tools.initializer.LedgerBindingConfig.BindingConfig;
 import com.jd.blockchain.tools.initializer.LedgerInitProperties.ConsensusParticipantConfig;
 import com.jd.blockchain.tools.keygen.KeyGenCommand;
@@ -186,7 +184,8 @@ public class LedgerInitCommand {
 		// 设置账本名称
 		bindingConf.setLedgerName(ledgerInitProperties.getLedgerName());
 
-		bindingConf.getParticipant().setAddress(ledgerInitProperties.getConsensusParticipant(currId).getAddress());
+		bindingConf.getParticipant()
+				.setAddress(ledgerInitProperties.getConsensusParticipant(currId).getAddress().toBase58());
 		// 设置参与方名称
 		bindingConf.getParticipant().setName(ledgerInitProperties.getConsensusParticipant(currId).getName());
 

source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitProperties.java

@@ -14,6 +14,7 @@ import com.jd.blockchain.crypto.AddressEncoding;
 import com.jd.blockchain.crypto.PubKey;
 import com.jd.blockchain.ledger.ParticipantNode;
 import com.jd.blockchain.tools.keygen.KeyGenCommand;
+import com.jd.blockchain.utils.Bytes;
 import com.jd.blockchain.utils.PropertiesUtils;
 import com.jd.blockchain.utils.codec.HexUtils;
 import com.jd.blockchain.utils.io.FileUtils;
@@ -262,7 +263,7 @@ public class LedgerInitProperties {
 
 		private int id;
 
-		private String address;
+		private Bytes address;
 
 		private String name;
 
@@ -283,7 +284,7 @@ public class LedgerInitProperties {
 		}
 
 		@Override
-		public String getAddress() {
+		public Bytes getAddress() {
 			return address;
 		}
 
@@ -317,7 +318,7 @@ public class LedgerInitProperties {
 
 		public void setPubKey(PubKey pubKey) {
 			this.pubKey = pubKey;
-			this.address = AddressEncoding.generateAddress(pubKey).toBase58();
+			this.address = AddressEncoding.generateAddress(pubKey);
 		}
 
 	}

source/tools/tools-initializer/src/test/resources/ledger-binding.conf

@@ -6,7 +6,9 @@ j5kLUENMvcUooZjKfz2bEYU6zoK9DAqbdDDU8aZEZFR4qf
 
 #第1个账本[j5ptBmn67B2p3yki3ji1j2ZMjnJhrUvP4kFpGmcXgvrhmk]的配置；
 #账本的当前共识参与方的ID；
+binding.j5ptBmn67B2p3yki3ji1j2ZMjnJhrUvP4kFpGmcXgvrhmk.name= PRODUCT-INFO
 binding.j5ptBmn67B2p3yki3ji1j2ZMjnJhrUvP4kFpGmcXgvrhmk.parti.address=1
+binding.j5ptBmn67B2p3yki3ji1j2ZMjnJhrUvP4kFpGmcXgvrhmk.parti.name=PARTI-01
 #账本的当前共识参与方的私钥文件的保存路径；
 binding.j5ptBmn67B2p3yki3ji1j2ZMjnJhrUvP4kFpGmcXgvrhmk.parti.pk-path=keys/jd-com.priv
 #账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
@@ -21,7 +23,9 @@ binding.j5ptBmn67B2p3yki3ji1j2ZMjnJhrUvP4kFpGmcXgvrhmk.db.pwd=kksfweffj
 
 #第2个账本[j5kLUENMvcUooZjKfz2bEYU6zoK9DAqbdDDU8aZEZFR4qf]的配置；
 #账本的当前共识参与方的ID；
+binding.j5kLUENMvcUooZjKfz2bEYU6zoK9DAqbdDDU8aZEZFR4qf.name= BASIC-INFO
 binding.j5kLUENMvcUooZjKfz2bEYU6zoK9DAqbdDDU8aZEZFR4qf.parti.address=2
+binding.j5kLUENMvcUooZjKfz2bEYU6zoK9DAqbdDDU8aZEZFR4qf.parti.name=PARTI-02
 #账本的当前共识参与方的私钥文件的保存路径；
 binding.j5kLUENMvcUooZjKfz2bEYU6zoK9DAqbdDDU8aZEZFR4qf.parti.pk-path=keys/jd-com-1.priv
 #账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；