diff --git a/core b/core index a362e64b..8ad37f07 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a362e64baebc34799ba2039991d30c62c55841eb +Subproject commit 8ad37f0727ac0c4bd2786a5b9b2ba19d61ebc468 diff --git a/framework b/framework index cb225648..977dddaf 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit cb22564841f28f356bd311e3b35a221e547973d8 +Subproject commit 977dddaf0dbc8966c007e9676bb1f79ab24d45a2 diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java index 2879c503..fe0b7d5f 100644 --- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java +++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java @@ -16,14 +16,11 @@ import com.jd.blockchain.crypto.AsymmetricKeypair; import com.jd.blockchain.crypto.Crypto; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.crypto.HashFunction; -import com.jd.blockchain.crypto.PubKey; -import com.jd.blockchain.crypto.SignatureDigest; import com.jd.blockchain.crypto.SignatureFunction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.BlockchainKeyGenerator; import com.jd.blockchain.ledger.BlockchainKeypair; import com.jd.blockchain.ledger.DigitalSignature; -import com.jd.blockchain.ledger.TypedKVEntry; import com.jd.blockchain.ledger.LedgerBlock; import com.jd.blockchain.ledger.LedgerInfo; import com.jd.blockchain.ledger.LedgerTransaction; @@ -32,10 +29,10 @@ import com.jd.blockchain.ledger.TransactionContent; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; +import com.jd.blockchain.ledger.TypedKVEntry; import com.jd.blockchain.sdk.BlockchainService; import com.jd.blockchain.sdk.client.GatewayServiceFactory; import com.jd.blockchain.transaction.TxResponseMessage; -import com.jd.blockchain.utils.serialize.json.JSONSerializeUtils; /** * 插入数据测试 @@ -112,12 +109,12 @@ public class SDK_GateWay_Query_Test_ { LedgerTransaction[] txList = service.getTransactions(ledgerHash, ledgerNumber, 0, 100); for (LedgerTransaction ledgerTransaction : txList) { - System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getTransactionHash()); + System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getRequest().getTransactionHash()); } txList = service.getTransactions(ledgerHash, hashDigest, 0, 100); for (LedgerTransaction ledgerTransaction : txList) { - System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getTransactionHash()); + System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getRequest().getTransactionHash()); } LedgerTransaction tx = service.getTransactionByContentHash(ledgerHash, hashDigest); @@ -125,8 +122,8 @@ public class SDK_GateWay_Query_Test_ { for (DigitalSignature signature : signatures) { System.out.println(signature.getDigest().getAlgorithm()); } - System.out.println("transaction.blockHeight=" + tx.getBlockHeight()); - System.out.println("transaction.executionState=" + tx.getExecutionState()); + System.out.println("transaction.blockHeight=" + tx.getResult().getBlockHeight()); + System.out.println("transaction.executionState=" + tx.getResult().getExecutionState()); ParticipantNode[] participants = service.getConsensusParticipants(ledgerHash); for (ParticipantNode participant : participants) { diff --git a/test b/test index 1230988e..6bc09d89 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 1230988e3e5bd8247c1bc505556a146f18794a98 +Subproject commit 6bc09d89d690d61a731c5e2aaca44de226c1fe96