From b8cae15eb41e260ae87a3e6867f34d8864d9ce46 Mon Sep 17 00:00:00 2001 From: Shine Li Date: Wed, 27 Jul 2022 11:36:13 +0800 Subject: [PATCH] update (#874) Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> --- neo-cli/CLI/MainService.Contracts.cs | 2 +- neo-cli/CLI/MainService.NEP17.cs | 2 +- neo-cli/CLI/MainService.Network.cs | 2 +- neo-cli/CLI/MainService.Plugins.cs | 8 ++++---- neo-cli/CLI/MainService.Vote.cs | 2 +- neo-cli/CLI/MainService.Wallet.cs | 2 +- neo-cli/CLI/MainService.cs | 6 +++--- neo-cli/neo-cli.csproj | 2 +- neo-gui/GUI/InvokeContractDialog.cs | 8 ++++---- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/neo-cli/CLI/MainService.Contracts.cs b/neo-cli/CLI/MainService.Contracts.cs index 05125b64b..aa7e0b50a 100644 --- a/neo-cli/CLI/MainService.Contracts.cs +++ b/neo-cli/CLI/MainService.Contracts.cs @@ -9,7 +9,7 @@ // modifications are permitted. using Neo.ConsoleService; -using Neo.IO.Json; +using Neo.Json; using Neo.Network.P2P.Payloads; using Neo.SmartContract; using Neo.SmartContract.Native; diff --git a/neo-cli/CLI/MainService.NEP17.cs b/neo-cli/CLI/MainService.NEP17.cs index 7eee6dec6..3c28b4375 100644 --- a/neo-cli/CLI/MainService.NEP17.cs +++ b/neo-cli/CLI/MainService.NEP17.cs @@ -9,7 +9,7 @@ // modifications are permitted. using Neo.ConsoleService; -using Neo.IO.Json; +using Neo.Json; using Neo.Network.P2P.Payloads; using Neo.SmartContract; using Neo.SmartContract.Native; diff --git a/neo-cli/CLI/MainService.Network.cs b/neo-cli/CLI/MainService.Network.cs index 9b01f231b..fd6a48876 100644 --- a/neo-cli/CLI/MainService.Network.cs +++ b/neo-cli/CLI/MainService.Network.cs @@ -11,7 +11,7 @@ using Akka.Actor; using Neo.ConsoleService; using Neo.IO; -using Neo.IO.Json; +using Neo.Json; using Neo.Network.P2P; using Neo.Network.P2P.Capabilities; using Neo.Network.P2P.Payloads; diff --git a/neo-cli/CLI/MainService.Plugins.cs b/neo-cli/CLI/MainService.Plugins.cs index 9079e3604..6e089f796 100644 --- a/neo-cli/CLI/MainService.Plugins.cs +++ b/neo-cli/CLI/MainService.Plugins.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Configuration; using Neo.ConsoleService; -using Neo.IO.Json; +using Neo.Json; using Neo.Plugins; using System; using System.Collections.Generic; @@ -79,13 +79,13 @@ private async Task DownloadPluginAsync(string pluginName) $"{GetType().Assembly.GetName().Name}/{GetType().Assembly.GetVersion()}"); using HttpResponseMessage responseApi = await http.SendAsync(request); byte[] buffer = await responseApi.Content.ReadAsByteArrayAsync(); - JObject releases = JObject.Parse(buffer); - JObject asset = releases.GetArray() + var releases = JObject.Parse(buffer); + var asset = ((JArray)releases) .Where(p => !p["tag_name"].GetString().Contains('-')) .Select(p => new { Version = Version.Parse(p["tag_name"].GetString().TrimStart('v')), - Assets = p["assets"].GetArray() + Assets = (JArray)p["assets"] }) .OrderByDescending(p => p.Version) .First(p => p.Version <= versionCore).Assets diff --git a/neo-cli/CLI/MainService.Vote.cs b/neo-cli/CLI/MainService.Vote.cs index 927515f6c..4fc680fc2 100644 --- a/neo-cli/CLI/MainService.Vote.cs +++ b/neo-cli/CLI/MainService.Vote.cs @@ -10,7 +10,7 @@ using Neo.ConsoleService; using Neo.Cryptography.ECC; -using Neo.IO.Json; +using Neo.Json; using Neo.SmartContract; using Neo.SmartContract.Native; using Neo.VM; diff --git a/neo-cli/CLI/MainService.Wallet.cs b/neo-cli/CLI/MainService.Wallet.cs index 7be27166b..b5e7ed619 100644 --- a/neo-cli/CLI/MainService.Wallet.cs +++ b/neo-cli/CLI/MainService.Wallet.cs @@ -11,7 +11,7 @@ using Akka.Actor; using Neo.ConsoleService; using Neo.Cryptography.ECC; -using Neo.IO.Json; +using Neo.Json; using Neo.Network.P2P.Payloads; using Neo.Persistence; using Neo.SmartContract; diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs index 409efeaf4..ed27b1858 100644 --- a/neo-cli/CLI/MainService.cs +++ b/neo-cli/CLI/MainService.cs @@ -12,7 +12,7 @@ using Neo.ConsoleService; using Neo.Cryptography.ECC; using Neo.IO; -using Neo.IO.Json; +using Neo.Json; using Neo.Ledger; using Neo.Network.P2P; using Neo.Network.P2P.Payloads; @@ -80,7 +80,7 @@ public MainService() : base() RegisterCommandHandler(str => str.Select(u => ECPoint.Parse(u.Trim(), ECCurve.Secp256r1)).ToArray()); RegisterCommandHandler(str => JObject.Parse(str)); RegisterCommandHandler(str => decimal.Parse(str, CultureInfo.InvariantCulture)); - RegisterCommandHandler(obj => (JArray)obj); + RegisterCommandHandler(obj => (JArray)obj); RegisterCommand(this); @@ -565,7 +565,7 @@ private bool OnInvokeWithResult(UInt160 scriptHash, string operation, out StackI { foreach (var contractParameter in contractParameters) { - parameters.Add(ContractParameter.FromJson(contractParameter)); + parameters.Add(ContractParameter.FromJson((JObject)contractParameter)); } } diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj index 7e5a0124b..7a022c113 100644 --- a/neo-cli/neo-cli.csproj +++ b/neo-cli/neo-cli.csproj @@ -23,7 +23,7 @@ - + diff --git a/neo-gui/GUI/InvokeContractDialog.cs b/neo-gui/GUI/InvokeContractDialog.cs index 8de5fd930..cb2029b62 100644 --- a/neo-gui/GUI/InvokeContractDialog.cs +++ b/neo-gui/GUI/InvokeContractDialog.cs @@ -8,7 +8,7 @@ // Redistribution and use in source and binary forms with or without // modifications are permitted. -using Neo.IO.Json; +using Neo.Json; using Neo.Network.P2P.Payloads; using Neo.Properties; using Neo.SmartContract; @@ -112,7 +112,7 @@ private void button6_Click(object sender, EventArgs e) private void button7_Click(object sender, EventArgs e) { if (openFileDialog2.ShowDialog() != DialogResult.OK) return; - abi = JObject.Parse(File.ReadAllText(openFileDialog2.FileName)); + abi = (JObject)JToken.Parse(File.ReadAllText(openFileDialog2.FileName)); script_hash = UInt160.Parse(abi["hash"].AsString()); textBox8.Text = script_hash.ToString(); comboBox1.Items.Clear(); @@ -134,9 +134,9 @@ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) { if (!(comboBox1.SelectedItem is string method)) return; JArray functions = (JArray)abi["functions"]; - JObject function = functions.First(p => p["name"].AsString() == method); + var function = functions.First(p => p["name"].AsString() == method); JArray _params = (JArray)function["parameters"]; - parameters = _params.Select(p => new ContractParameter(p["type"].TryGetEnum())).ToArray(); + parameters = _params.Select(p => new ContractParameter(p["type"].AsEnum())).ToArray(); textBox9.Text = string.Join(", ", _params.Select(p => p["name"].AsString())); button8.Enabled = parameters.Length > 0; UpdateScript();