diff --git a/neo.UnitTests/UT_Block.cs b/neo.UnitTests/UT_Block.cs index c0c1163d5e..f7acf254be 100644 --- a/neo.UnitTests/UT_Block.cs +++ b/neo.UnitTests/UT_Block.cs @@ -240,12 +240,7 @@ public void RebuildMerkleRoot_Updates() public void ToJson() { UInt256 val256 = UInt256.Zero; - UInt256 merkRoot; - UInt160 val160; - uint timestampVal, indexVal; - Witness scriptVal; - Transaction[] transactionsVal; - TestUtils.SetupBlockWithValues(uut, val256, out merkRoot, out val160, out timestampVal, out indexVal, out scriptVal, out transactionsVal, 1); + TestUtils.SetupBlockWithValues(uut, val256, out var merkRoot, out var val160, out var timestampVal, out var indexVal, out var scriptVal, out var transactionsVal, 1); JObject jObj = uut.ToJson(); jObj.Should().NotBeNull(); @@ -264,7 +259,7 @@ public void ToJson() jObj["tx"].Should().NotBeNull(); JArray txObj = (JArray)jObj["tx"]; - txObj[0]["txid"].AsString().Should().Be("0x7647acf1ef8a841b87f2369398a0e9f0ccde0ed9e835d980657103da6da59580"); + txObj[0]["hash"].AsString().Should().Be("0x7647acf1ef8a841b87f2369398a0e9f0ccde0ed9e835d980657103da6da59580"); txObj[0]["size"].AsNumber().Should().Be(50); txObj[0]["version"].AsNumber().Should().Be(0); ((JArray)txObj[0]["attributes"]).Count.Should().Be(0); diff --git a/neo.UnitTests/UT_Transaction.cs b/neo.UnitTests/UT_Transaction.cs index 2600867986..b192a2479d 100644 --- a/neo.UnitTests/UT_Transaction.cs +++ b/neo.UnitTests/UT_Transaction.cs @@ -82,7 +82,7 @@ public void ToJson() JObject jObj = uut.ToJson(); jObj.Should().NotBeNull(); - jObj["txid"].AsString().Should().Be("0x38274692538dfecaae36f8fd518d92bae25607d491c40a8f927cc06bd97ab2c8"); + jObj["hash"].AsString().Should().Be("0x38274692538dfecaae36f8fd518d92bae25607d491c40a8f927cc06bd97ab2c8"); jObj["size"].AsNumber().Should().Be(81); jObj["version"].AsNumber().Should().Be(0); ((JArray)jObj["attributes"]).Count.Should().Be(0); diff --git a/neo/Network/P2P/Payloads/Transaction.cs b/neo/Network/P2P/Payloads/Transaction.cs index 52a6fc867a..b21f02ccbb 100644 --- a/neo/Network/P2P/Payloads/Transaction.cs +++ b/neo/Network/P2P/Payloads/Transaction.cs @@ -176,7 +176,7 @@ void IVerifiable.SerializeUnsigned(BinaryWriter writer) public JObject ToJson() { JObject json = new JObject(); - json["txid"] = Hash.ToString(); + json["hash"] = Hash.ToString(); json["size"] = Size; json["version"] = Version; json["nonce"] = Nonce; diff --git a/neo/Network/RPC/RpcServer.cs b/neo/Network/RPC/RpcServer.cs index 6b5e7f549d..6bfdd15618 100644 --- a/neo/Network/RPC/RpcServer.cs +++ b/neo/Network/RPC/RpcServer.cs @@ -90,12 +90,16 @@ private JObject GetInvokeResult(byte[] script) return json; } - private static JObject GetRelayResult(RelayResultReason reason) + private static JObject GetRelayResult(RelayResultReason reason, UInt256 hash) { switch (reason) { case RelayResultReason.Succeed: - return true; + { + var ret = new JObject(); + ret["hash"] = hash.ToString(); + return ret; + } case RelayResultReason.AlreadyExists: throw new RpcException(-501, "Block or transaction already exists and cannot be sent repeatedly."); case RelayResultReason.OutOfMemory: @@ -606,13 +610,13 @@ private JObject ListPlugins() private JObject SendRawTransaction(Transaction tx) { RelayResultReason reason = system.Blockchain.Ask(tx).Result; - return GetRelayResult(reason); + return GetRelayResult(reason, tx.Hash); } private JObject SubmitBlock(Block block) { RelayResultReason reason = system.Blockchain.Ask(block).Result; - return GetRelayResult(reason); + return GetRelayResult(reason, block.Hash); } private JObject ValidateAddress(string address)