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

PR Correction #2

Merged
merged 14 commits into from
Jun 26, 2019
Merged

PR Correction #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
efd27a8
backup files
joeqian10 Jun 21, 2019
26b4334
Merge branch 'master' of https://github.com/chenquanyu/neo
joeqian10 Jun 21, 2019
3ae6480
change json deserialize method with Neo JObject
chenquanyu Jun 24, 2019
5de69a0
Merge remote-tracking branch 'erik/master'
chenquanyu Jun 24, 2019
31bee40
Remove log from tx hash (#854)
shargon Jun 24, 2019
ca1048e
modified JSON implementation, added FromJson()
joeqian10 Jun 26, 2019
af6d7e0
Merge remote-tracking branch 'erik/master'
chenquanyu Jun 26, 2019
2f58594
more RPC change
joeqian10 Jun 26, 2019
d5fa4a7
PR correction
chenquanyu Jun 26, 2019
67aa682
Store transaction result (#864)
shargon Jun 26, 2019
90b225c
RPC module fix, remove newton.json
joeqian10 Jun 26, 2019
a08d5e9
fix
joeqian10 Jun 26, 2019
238abd5
Merge remote-tracking branch 'erik/master'
chenquanyu Jun 26, 2019
7c193b5
Merge branch 'dev' into master
chenquanyu Jun 26, 2019
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
158 changes: 83 additions & 75 deletions neo.UnitTests/SDK/UT_RpcClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using Moq.Protected;
using Neo.IO;
Expand Down Expand Up @@ -74,7 +74,7 @@ public void TestErrorResponse()
{
Assert.AreEqual(-32700, ex.HResult);
Assert.AreEqual("Parse error", ex.Message);
Assert.AreEqual("something", ex.Data["data"]);
Assert.AreEqual("something", ((JObject)ex.Data["data"]).AsString());
}
}

Expand Down Expand Up @@ -122,17 +122,19 @@ public void TestGetBlock()

JObject json = block.ToJson();
json["confirmations"] = 20;
json["nextblockhash"] = "nexthash";
json["nextblockhash"] = "773dd2dae4a9c9275290f89b56e67d7363ea4826dfd4fc13cc01cf73a44b0d0e";

JObject response = RpcServer.CreateResponse(1);
response["result"] = json;
MockResponse(response.ToString());

var result = rpc.GetBlock("773dd2dae4a9c9275290f89b56e67d7363ea4826dfd4fc13cc01cf73a44b0d0e");
Assert.AreEqual(block.Hash.ToString(), result.Hash);

Assert.AreEqual(block.Hash.ToString(), result.Block.Hash.ToString());
Assert.AreEqual(20, result.Confirmations);
Assert.AreEqual(block.Transactions.Length, result.Tx.Length);
Assert.AreEqual(block.Transactions[0].Hash.ToString(), result.Tx[0].Hash);
Assert.AreEqual(block.Transactions.Length, result.Block.Transactions.Length);
Assert.AreEqual(block.Transactions[0].Hash.ToString(), result.Block.Transactions[0].Hash.ToString());

}

[TestMethod]
Expand Down Expand Up @@ -176,15 +178,17 @@ public void TestGetBlockHeader()

JObject json = header.ToJson();
json["confirmations"] = 20;
json["nextblockhash"] = "nexthash";

json["nextblockhash"] = "4c1e879872344349067c3b1a30781eeb4f9040d3795db7922f513f6f9660b9b2";

JObject response = RpcServer.CreateResponse(1);
response["result"] = json;
MockResponse(response.ToString());

var result = rpc.GetBlockHeader("100");

Assert.AreEqual(header.Hash.ToString(), result.Hash);
Assert.AreEqual(header.Hash.ToString(), result.Header.Hash.ToString());

Assert.AreEqual(20, result.Confirmations);
}

Expand Down Expand Up @@ -213,22 +217,22 @@ public void TestGetConnectionCount()
[TestMethod]
public void TestGetContractState()
{
var script = new ScriptBuilder();
script.EmitSysCall(InteropService.System_Runtime_GetInvocationCounter);
var sb = new ScriptBuilder();
sb.EmitSysCall(InteropService.System_Runtime_GetInvocationCounter);

ContractState state = new ContractState
{
Script = new byte[] { (byte)OpCode.DROP, (byte)OpCode.DROP }.Concat(script.ToArray()).ToArray(),
Script = new byte[] { (byte)OpCode.DROP, (byte)OpCode.DROP }.Concat(sb.ToArray()).ToArray(),
Manifest = ContractManifest.CreateDefault(UInt160.Parse("0xa400ff00ff00ff00ff00ff00ff00ff00ff00ff01"))
};

JObject response = RpcServer.CreateResponse(1);
response["result"] = state.ToJson();
MockResponse(response.ToString());

var result = rpc.GetContractState("hash");
var result = rpc.GetContractState("17694b31cc7ee215cea2ded146e0b2b28768fc46");

Assert.AreEqual(state.Script.ToHexString(), result.Script);
Assert.AreEqual(state.Script.ToHexString(), result.Script.ToHexString());
Assert.AreEqual(state.Manifest.Abi.EntryPoint.Name, result.Manifest.Abi.EntryPoint.Name);
}

Expand All @@ -237,32 +241,32 @@ public void TestGetPeers()
{
JObject response = RpcServer.CreateResponse(1);
response["result"] = JObject.Parse(@"{
""unconnected"": [
{
""address"": ""::ffff:70.73.16.236"",
""port"": 10333
},
{
""address"": ""::ffff:82.95.77.148"",
""port"": 10333
},
{
""address"": ""::ffff:49.50.215.166"",
""port"": 10333
}
],
""bad"": [],
""connected"": [
{
""address"": ""::ffff:139.219.106.33"",
""port"": 10333
},
{
""address"": ""::ffff:47.88.53.224"",
""port"": 10333
}
]
}");
""unconnected"": [
{
""address"": ""::ffff:70.73.16.236"",
""port"": 10333
},
{
""address"": ""::ffff:82.95.77.148"",
""port"": 10333
},
{
""address"": ""::ffff:49.50.215.166"",
""port"": 10333
}
],
""bad"": [],
""connected"": [
{
""address"": ""::ffff:139.219.106.33"",
""port"": 10333
},
{
""address"": ""::ffff:47.88.53.224"",
""port"": 10333
}
]
}");
MockResponse(response.ToString());

var result = rpc.GetPeers();
Expand All @@ -275,10 +279,11 @@ public void TestGetRawMempool()
{
JObject response = RpcServer.CreateResponse(1);
response["result"] = JObject.Parse(@"[
""0x9786cce0dddb524c40ddbdd5e31a41ed1f6b5c8a683c122f627ca4a007a7cf4e"",
""0xb488ad25eb474f89d5ca3f985cc047ca96bc7373a6d3da8c0f192722896c1cd7"",
""0xf86f6f2c08fbf766ebe59dc84bc3b8829f1053f0a01deb26bf7960d99fa86cd6""
]");
""0x9786cce0dddb524c40ddbdd5e31a41ed1f6b5c8a683c122f627ca4a007a7cf4e"",
""0xb488ad25eb474f89d5ca3f985cc047ca96bc7373a6d3da8c0f192722896c1cd7"",
""0xf86f6f2c08fbf766ebe59dc84bc3b8829f1053f0a01deb26bf7960d99fa86cd6""
]");

MockResponse(response.ToString());

var result = rpc.GetRawMempool();
Expand All @@ -300,6 +305,8 @@ public void TestGetRawMempoolBoth()
var result = rpc.GetRawMempoolBoth();
Assert.AreEqual((uint)65535, result.Height);
Assert.AreEqual("0x9786cce0dddb524c40ddbdd5e31a41ed1f6b5c8a683c122f627ca4a007a7cf4e", result.Verified[0]);
Assert.AreEqual("0xf86f6f2c08fbf766ebe59dc84bc3b8829f1053f0a01deb26bf7960d99fa86cd6", result.UnVerified[1]);

}

[TestMethod]
Expand All @@ -310,8 +317,7 @@ public void TestGetRawTransactionHex()
JObject response = RpcServer.CreateResponse(1);
response["result"] = json;
MockResponse(response.ToString());

var result = rpc.GetRawTransactionHex("0x9786cce0dddb524c40ddbdd5e31a41ed1f6b5c8a683c122f627ca4a007a7cf4e");
var result = rpc.GetRawTransactionHex(TestUtils.GetTransaction().Hash.ToString());
Assert.AreEqual(json, result);
}

Expand All @@ -325,8 +331,9 @@ public void TestGetRawTransaction()
MockResponse(response.ToString());

var result = rpc.GetRawTransaction("0x9786cce0dddb524c40ddbdd5e31a41ed1f6b5c8a683c122f627ca4a007a7cf4e");
Assert.AreEqual(transaction.Hash.ToString(), result.Hash);
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));

Assert.AreEqual(transaction.Hash, result.Hash);
Assert.AreEqual(json.ToString(), result.ToJson().ToString());
}

[TestMethod]
Expand Down Expand Up @@ -357,22 +364,23 @@ public void TestGetTransactionHeight()
public void TestGetValidators()
{
JObject json = JObject.Parse(@"[
{
""publickey"": ""02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70"",
""votes"": ""46632420"",
""active"": true
},
{
""publickey"": ""024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d"",
""votes"": ""46632420"",
""active"": true
}]");
{
""publickey"": ""02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70"",
""votes"": ""46632420"",
""active"": true
},
{
""publickey"": ""024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d"",
""votes"": ""46632420"",
""active"": true
}
]");
JObject response = RpcServer.CreateResponse(1);
response["result"] = json;
MockResponse(response.ToString());

var result = rpc.GetValidators();
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
Assert.AreEqual(((JArray)json)[0].ToString(), (result[0]).ToJson().ToString());
}

[TestMethod]
Expand All @@ -385,11 +393,11 @@ public void TestGetVersion()
json["useragent"] = "/NEO:2.7.5/";

var json1 = JObject.Parse(@"{
""tcpPort"": 30001,
""wsPort"": 30002,
""nonce"": 1546258664,
""useragent"": ""/NEO:2.7.5/""
}");
""tcpPort"": 30001,
""wsPort"": 30002,
""nonce"": 1546258664,
""useragent"": ""/NEO:2.7.5/""
}");
Assert.AreEqual(json.ToString(), json1.ToString());

JObject response = RpcServer.CreateResponse(1);
Expand All @@ -414,14 +422,16 @@ public void TestInvokeFunction()
""type"": ""ByteArray"",
""value"": ""262bec084432""
}
]
],
""tx"":""d101361426ae7c6c9861ec418468c1f0fdc4a7f2963eb89151c10962616c616e63654f6667be39e7b562f60cbfe2aebca375a2e5ee28737caf000000000000000000000000""

}");
JObject response = RpcServer.CreateResponse(1);
response["result"] = json;
MockResponse(response.ToString());

var result = rpc.InvokeFunction("af7c7328eee5a275a3bcaee2bf0cf662b5e739be", "balanceOf", new[] { new StackJson { Type = "Hash160", Value = "91b83e96f2a7c4fdf0c1688441ec61986c7cae26" } });
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
var result = rpc.InvokeFunction("af7c7328eee5a275a3bcaee2bf0cf662b5e739be", "balanceOf", new[] { new SDK_StackJson { Type = "Hash160", Value = "91b83e96f2a7c4fdf0c1688441ec61986c7cae26" } });
Assert.AreEqual(json.ToString(), result.ToJson().ToString());
}

[TestMethod]
Expand All @@ -437,14 +447,15 @@ public void TestInvokeScript()
""type"": ""ByteArray"",
""value"": ""262bec084432""
}
]
],
""tx"":""d101361426ae7c6c9861ec418468c1f0fdc4a7f2963eb89151c10962616c616e63654f6667be39e7b562f60cbfe2aebca375a2e5ee28737caf000000000000000000000000""
}");
JObject response = RpcServer.CreateResponse(1);
response["result"] = json;
MockResponse(response.ToString());

var result = rpc.InvokeScript("00046e616d656724058e5e1b6008847cd662728549088a9ee82191");
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
Assert.AreEqual(json.ToString(), result.ToJson().ToString());
}

[TestMethod]
Expand All @@ -463,7 +474,7 @@ public void TestListPlugins()
MockResponse(response.ToString());

var result = rpc.ListPlugins();
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
Assert.AreEqual(((JArray)json)[0].ToString(), result[0].ToJson().ToString());
}

[TestMethod]
Expand All @@ -475,7 +486,7 @@ public void TestSendRawTransaction()
MockResponse(response.ToString());

var result = rpc.SendRawTransaction("80000001195876cb34364dc38b730077156c6bc3a7fc570044a66fbfeeea56f71327e8ab0000029b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500c65eaf440000000f9a23e06f74cf86b8827a9108ec2e0f89ad956c9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50092e14b5e00000030aab52ad93f6ce17ca07fa88fc191828c58cb71014140915467ecd359684b2dc358024ca750609591aa731a0b309c7fb3cab5cd0836ad3992aa0a24da431f43b68883ea5651d548feb6bd3c8e16376e6e426f91f84c58232103322f35c7819267e721335948d385fae5be66e7ba8c748ac15467dcca0693692dac");
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
Assert.AreEqual(json.ToString(), ((JObject)result).ToString());
}

[TestMethod]
Expand All @@ -487,7 +498,7 @@ public void TestSubmitBlock()
MockResponse(response.ToString());

var result = rpc.SubmitBlock("03febccf81ac85e3d795bc5cbd4e84e907812aa3");
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
Assert.AreEqual(json.ToString(), ((JObject)result).ToString());
}

[TestMethod]
Expand All @@ -501,11 +512,8 @@ public void TestValidateAddress()
MockResponse(response.ToString());

var result = rpc.ValidateAddress("AQVh2pG732YvtNaxEGkQUei3YA4cvo7d2i");
Assert.AreEqual(json.ToString(), JsonConvert.SerializeObject(result));
Assert.AreEqual(json.ToString(), result.ToJson().ToString());
}

}



}
3 changes: 2 additions & 1 deletion neo.UnitTests/UT_MemoryPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ private void AddTransactions(int count)
for (int i = 0; i < count; i++)
{
var txToAdd = CreateTransaction();
Console.WriteLine($"created tx: {txToAdd.Hash}");
_unit.TryAdd(txToAdd.Hash, txToAdd);
}

Console.WriteLine($"created {count} tx");
}


Expand Down
10 changes: 7 additions & 3 deletions neo/Ledger/Blockchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,15 +431,19 @@ private void Persist(Block block)
snapshot.Blocks.Add(block.Hash, block.Trim());
foreach (Transaction tx in block.Transactions)
{
snapshot.Transactions.Add(tx.Hash, new TransactionState
var state = new TransactionState
{
BlockIndex = block.Index,
Transaction = tx
});
};

snapshot.Transactions.Add(tx.Hash, state);

using (ApplicationEngine engine = new ApplicationEngine(TriggerType.Application, tx, snapshot.Clone(), tx.SystemFee))
{
engine.LoadScript(tx.Script);
if (!engine.Execute().HasFlag(VMState.FAULT))
state.VMState = engine.Execute();
if (state.VMState == VMState.HALT)
{
engine.Snapshot.Commit();
}
Expand Down
8 changes: 8 additions & 0 deletions neo/Ledger/ContractState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,13 @@ public JObject ToJson()
json["manifest"] = Manifest.ToJson();
return json;
}

public static ContractState FromJson(JObject json)
{
ContractState contractState = new ContractState();
contractState.Script = json["script"].AsString().HexToBytes();
contractState.Manifest = ContractManifest.FromJson(json["manifest"]);
return contractState;
}
}
}
Loading