Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add relayresult #200

Closed
wants to merge 28 commits into from
Closed

Add relayresult #200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
53f3e3b
add relayresult
bettybao1209 Mar 27, 2020
053f21a
subscribe event stream
bettybao1209 Mar 27, 2020
2653c3b
define as static var
bettybao1209 Mar 30, 2020
871688c
extract class
bettybao1209 Mar 30, 2020
86bc55a
Update dependency
erikzhang Mar 30, 2020
4897fdd
Reorganize files.
erikzhang Mar 30, 2020
ce0c17e
Rename
erikzhang Mar 30, 2020
06b526c
Fix
erikzhang Mar 30, 2020
d77f76e
Update RpcServer.Node.cs
erikzhang Mar 30, 2020
1bb7479
static
erikzhang Mar 30, 2020
007ff3e
add dictionary
bettybao1209 Mar 30, 2020
def1ebf
Optimize dictionary access
shargon Mar 30, 2020
ca3eadc
add expire milliseconds for dictionary
chenquanyu Apr 1, 2020
0211568
Merge pull request #4 from chenquanyu/add-relayreason
bettybao1209 Apr 1, 2020
8225053
Merge branch 'master' into add-relayreason
bettybao1209 Apr 7, 2020
91b2135
clean code
bettybao1209 Apr 7, 2020
6ad0bac
add dictionary with max size
bettybao1209 Apr 7, 2020
43bcfa1
Optimize
shargon Apr 7, 2020
0cb3d3e
update dependency
bettybao1209 Apr 8, 2020
beedd79
optimize FixedDictionary
bettybao1209 Apr 8, 2020
bf1d0cb
format
bettybao1209 Apr 8, 2020
eba944c
Rename
erikzhang Apr 9, 2020
5bf6d4d
internal
erikzhang Apr 9, 2020
2988b8d
create UT project for RpcServer
bettybao1209 Apr 9, 2020
b7e9f0a
fix
bettybao1209 Apr 9, 2020
93063aa
rename to Neo.Plugins.RpcServer.Tests
bettybao1209 Apr 9, 2020
2d63346
format
bettybao1209 Apr 9, 2020
07764a0
reorganize files
bettybao1209 Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/RpcServer/RpcServer.Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ private JObject GetPeers(JArray _params)
return json;
}

private static JObject GetRelayResult(RelayResultReason reason, UInt256 hash)
private static JObject GetRelayResult(VerifyResult reason, UInt256 hash)
{
if (reason == RelayResultReason.Succeed)
if (reason == VerifyResult.Succeed)
{
var ret = new JObject();
ret["hash"] = hash.ToString();
Expand All @@ -70,15 +70,15 @@ private JObject GetVersion(JArray _params)
private JObject SendRawTransaction(JArray _params)
{
Transaction tx = _params[0].AsString().HexToBytes().AsSerializable<Transaction>();
RelayResultReason reason = System.Blockchain.Ask<RelayResultReason>(tx).Result;
VerifyResult reason = System.Blockchain.Ask<VerifyResult>(tx).Result;
return GetRelayResult(reason, tx.Hash);
}

[RpcMethod]
private JObject SubmitBlock(JArray _params)
{
Block block = _params[0].AsString().HexToBytes().AsSerializable<Block>();
RelayResultReason reason = System.Blockchain.Ask<RelayResultReason>(block).Result;
VerifyResult reason = System.Blockchain.Ask<VerifyResult>(block).Result;
return GetRelayResult(reason, block.Hash);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Neo.Network.RPC.Tests/RpcTestCases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"error": {
"code": -500,
"message": "InsufficientFunds",
"data": " at Neo.Plugins.RpcServer.GetRelayResult(RelayResultReason reason, UInt256 hash)\r\n at Neo.Network.RPC.Models.RpcServer.SendRawTransaction(JArray _params)\r\n at Neo.Network.RPC.Models.RpcServer.ProcessRequest(HttpContext context, JObject request)"
"data": " at Neo.Plugins.RpcServer.GetRelayResult(VerifyResult reason, UInt256 hash)\r\n at Neo.Network.RPC.Models.RpcServer.SendRawTransaction(JArray _params)\r\n at Neo.Network.RPC.Models.RpcServer.ProcessRequest(HttpContext context, JObject request)"
}
}
},
Expand Down