From 49b713d01b9dee0f4fc3c28bc287187c0dbe8b4c Mon Sep 17 00:00:00 2001 From: joeqian Date: Thu, 2 Jul 2020 11:52:09 +0800 Subject: [PATCH] Change json fields to all lower case for consistency (#1736) --- src/neo/Ledger/TrimmedBlock.cs | 2 +- src/neo/Network/P2P/Payloads/Block.cs | 2 +- src/neo/Network/P2P/Payloads/Cosigner.cs | 4 ++-- src/neo/Network/P2P/Payloads/Transaction.cs | 6 +++--- src/neo/SmartContract/Manifest/ContractGroup.cs | 4 ++-- src/neo/SmartContract/Manifest/ContractManifest.cs | 4 ++-- .../Manifest/ContractMethodDescriptor.cs | 4 ++-- src/neo/Wallets/NEP6/NEP6Account.cs | 4 ++-- .../neo.UnitTests/Network/P2P/Payloads/UT_Block.cs | 2 +- .../Network/P2P/Payloads/UT_Cosigner.cs | 4 ++-- .../Network/P2P/Payloads/UT_Transaction.cs | 4 ++-- .../SmartContract/Manifest/UT_ContractManifest.cs | 14 +++++++------- tests/neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/neo/Ledger/TrimmedBlock.cs b/src/neo/Ledger/TrimmedBlock.cs index 2a6f84672b..5b58e40246 100644 --- a/src/neo/Ledger/TrimmedBlock.cs +++ b/src/neo/Ledger/TrimmedBlock.cs @@ -106,7 +106,7 @@ public override void Serialize(BinaryWriter writer) public override JObject ToJson() { JObject json = base.ToJson(); - json["consensus_data"] = ConsensusData?.ToJson(); + json["consensusdata"] = ConsensusData?.ToJson(); json["hashes"] = Hashes.Select(p => (JObject)p.ToString()).ToArray(); return json; } diff --git a/src/neo/Network/P2P/Payloads/Block.cs b/src/neo/Network/P2P/Payloads/Block.cs index 82b25252d3..bbea8db9cc 100644 --- a/src/neo/Network/P2P/Payloads/Block.cs +++ b/src/neo/Network/P2P/Payloads/Block.cs @@ -108,7 +108,7 @@ public override void Serialize(BinaryWriter writer) public override JObject ToJson() { JObject json = base.ToJson(); - json["consensus_data"] = ConsensusData.ToJson(); + json["consensusdata"] = ConsensusData.ToJson(); json["tx"] = Transactions.Select(p => p.ToJson()).ToArray(); return json; } diff --git a/src/neo/Network/P2P/Payloads/Cosigner.cs b/src/neo/Network/P2P/Payloads/Cosigner.cs index 6677c688ea..ba8a6fa3dd 100644 --- a/src/neo/Network/P2P/Payloads/Cosigner.cs +++ b/src/neo/Network/P2P/Payloads/Cosigner.cs @@ -53,9 +53,9 @@ public override JObject ToJson() json["account"] = Account.ToString(); json["scopes"] = Scopes; if (Scopes.HasFlag(WitnessScope.CustomContracts)) - json["allowedContracts"] = AllowedContracts.Select(p => (JObject)p.ToString()).ToArray(); + json["allowedcontracts"] = AllowedContracts.Select(p => (JObject)p.ToString()).ToArray(); if (Scopes.HasFlag(WitnessScope.CustomGroups)) - json["allowedGroups"] = AllowedGroups.Select(p => (JObject)p.ToString()).ToArray(); + json["allowedgroups"] = AllowedGroups.Select(p => (JObject)p.ToString()).ToArray(); return json; } } diff --git a/src/neo/Network/P2P/Payloads/Transaction.cs b/src/neo/Network/P2P/Payloads/Transaction.cs index 10591659ca..127f56cb17 100644 --- a/src/neo/Network/P2P/Payloads/Transaction.cs +++ b/src/neo/Network/P2P/Payloads/Transaction.cs @@ -247,9 +247,9 @@ public JObject ToJson() json["version"] = Version; json["nonce"] = Nonce; json["sender"] = Sender.ToAddress(); - json["sys_fee"] = SystemFee.ToString(); - json["net_fee"] = NetworkFee.ToString(); - json["valid_until_block"] = ValidUntilBlock; + json["sysfee"] = SystemFee.ToString(); + json["netfee"] = NetworkFee.ToString(); + json["validuntilblock"] = ValidUntilBlock; json["attributes"] = Attributes.Select(p => p.ToJson()).ToArray(); json["script"] = Convert.ToBase64String(Script); json["witnesses"] = Witnesses.Select(p => p.ToJson()).ToArray(); diff --git a/src/neo/SmartContract/Manifest/ContractGroup.cs b/src/neo/SmartContract/Manifest/ContractGroup.cs index 8cb6ced3b8..95b3d7e82b 100644 --- a/src/neo/SmartContract/Manifest/ContractGroup.cs +++ b/src/neo/SmartContract/Manifest/ContractGroup.cs @@ -40,7 +40,7 @@ public static ContractGroup FromJson(JObject json) { return new ContractGroup { - PubKey = ECPoint.Parse(json["pubKey"].AsString(), ECCurve.Secp256r1), + PubKey = ECPoint.Parse(json["pubkey"].AsString(), ECCurve.Secp256r1), Signature = Convert.FromBase64String(json["signature"].AsString()), }; } @@ -58,7 +58,7 @@ public bool IsValid(UInt160 hash) public virtual JObject ToJson() { var json = new JObject(); - json["pubKey"] = PubKey.ToString(); + json["pubkey"] = PubKey.ToString(); json["signature"] = Convert.ToBase64String(Signature); return json; } diff --git a/src/neo/SmartContract/Manifest/ContractManifest.cs b/src/neo/SmartContract/Manifest/ContractManifest.cs index 1d6124c334..b68eefbe89 100644 --- a/src/neo/SmartContract/Manifest/ContractManifest.cs +++ b/src/neo/SmartContract/Manifest/ContractManifest.cs @@ -111,7 +111,7 @@ public JObject ToJson() json["abi"] = Abi.ToJson(); json["permissions"] = Permissions.Select(p => p.ToJson()).ToArray(); json["trusts"] = Trusts.ToJson(); - json["safeMethods"] = SafeMethods.ToJson(); + json["safemethods"] = SafeMethods.ToJson(); json["extra"] = Extra; return json; @@ -158,7 +158,7 @@ private void DeserializeFromJson(JObject json) Features = ContractFeatures.NoProperty; Permissions = ((JArray)json["permissions"]).Select(u => ContractPermission.FromJson(u)).ToArray(); Trusts = WildcardContainer.FromJson(json["trusts"], u => UInt160.Parse(u.AsString())); - SafeMethods = WildcardContainer.FromJson(json["safeMethods"], u => u.AsString()); + SafeMethods = WildcardContainer.FromJson(json["safemethods"], u => u.AsString()); Extra = json["extra"]; if (json["features"]["storage"].AsBoolean()) Features |= ContractFeatures.HasStorage; if (json["features"]["payable"].AsBoolean()) Features |= ContractFeatures.Payable; diff --git a/src/neo/SmartContract/Manifest/ContractMethodDescriptor.cs b/src/neo/SmartContract/Manifest/ContractMethodDescriptor.cs index 873999096a..ecae987758 100644 --- a/src/neo/SmartContract/Manifest/ContractMethodDescriptor.cs +++ b/src/neo/SmartContract/Manifest/ContractMethodDescriptor.cs @@ -43,7 +43,7 @@ public int Offset Name = json["name"].AsString(), Parameters = ((JArray)json["parameters"]).Select(u => ContractParameterDefinition.FromJson(u)).ToArray(), Offset = (int)json["offset"].AsNumber(), - ReturnType = (ContractParameterType)Enum.Parse(typeof(ContractParameterType), json["returnType"].AsString()), + ReturnType = (ContractParameterType)Enum.Parse(typeof(ContractParameterType), json["returntype"].AsString()), }; } @@ -51,7 +51,7 @@ public override JObject ToJson() { var json = base.ToJson(); json["offset"] = Offset; - json["returnType"] = ReturnType.ToString(); + json["returntype"] = ReturnType.ToString(); return json; } } diff --git a/src/neo/Wallets/NEP6/NEP6Account.cs b/src/neo/Wallets/NEP6/NEP6Account.cs index 58ed806fb1..870b449400 100644 --- a/src/neo/Wallets/NEP6/NEP6Account.cs +++ b/src/neo/Wallets/NEP6/NEP6Account.cs @@ -33,7 +33,7 @@ public static NEP6Account FromJson(JObject json, NEP6Wallet wallet) return new NEP6Account(wallet, json["address"].AsString().ToScriptHash(), json["key"]?.AsString()) { Label = json["label"]?.AsString(), - IsDefault = json["isDefault"].AsBoolean(), + IsDefault = json["isdefault"].AsBoolean(), Lock = json["lock"].AsBoolean(), Contract = NEP6Contract.FromJson(json["contract"]), Extra = json["extra"] @@ -65,7 +65,7 @@ public JObject ToJson() JObject account = new JObject(); account["address"] = ScriptHash.ToAddress(); account["label"] = Label; - account["isDefault"] = IsDefault; + account["isdefault"] = IsDefault; account["lock"] = Lock; account["key"] = nep2key; account["contract"] = ((NEP6Contract)Contract)?.ToJson(); diff --git a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Block.cs b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Block.cs index 0e36930f0b..1efd90a3a8 100644 --- a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Block.cs +++ b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Block.cs @@ -218,7 +218,7 @@ public void ToJson() txObj[0]["size"].AsNumber().Should().Be(51); txObj[0]["version"].AsNumber().Should().Be(0); ((JArray)txObj[0]["attributes"]).Count.Should().Be(0); - txObj[0]["net_fee"].AsString().Should().Be("0"); + txObj[0]["netfee"].AsString().Should().Be("0"); } } } diff --git a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Cosigner.cs b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Cosigner.cs index 87ea4c8c26..22ca14cb82 100644 --- a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Cosigner.cs +++ b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Cosigner.cs @@ -121,7 +121,7 @@ public void Json_CustomContracts() Account = UInt160.Zero }; - var json = "{\"type\":\"Cosigner\",\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CustomContracts\",\"allowedContracts\":[\"0x0000000000000000000000000000000000000000\"]}"; + var json = "{\"type\":\"Cosigner\",\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CustomContracts\",\"allowedcontracts\":[\"0x0000000000000000000000000000000000000000\"]}"; attr.ToJson().ToString().Should().Be(json); } @@ -135,7 +135,7 @@ public void Json_CustomGroups() Account = UInt160.Zero }; - var json = "{\"type\":\"Cosigner\",\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CustomGroups\",\"allowedGroups\":[\"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c\"]}"; + var json = "{\"type\":\"Cosigner\",\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CustomGroups\",\"allowedgroups\":[\"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c\"]}"; attr.ToJson().ToString().Should().Be(json); } } diff --git a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs index 5425b71974..61ea913867 100644 --- a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs +++ b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs @@ -1031,9 +1031,9 @@ public void ToJson() jObj["size"].AsNumber().Should().Be(82); jObj["version"].AsNumber().Should().Be(0); ((JArray)jObj["attributes"]).Count.Should().Be(0); - jObj["net_fee"].AsString().Should().Be("0"); + jObj["netfee"].AsString().Should().Be("0"); jObj["script"].AsString().Should().Be("QiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA="); - jObj["sys_fee"].AsString().Should().Be("4200000000"); + jObj["sysfee"].AsString().Should().Be("4200000000"); } } } diff --git a/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs b/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs index 1df0b7ec07..ef2df0acff 100644 --- a/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs +++ b/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs @@ -11,7 +11,7 @@ public class UT_ContractManifest [TestMethod] public void ParseFromJson_Default() { - var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safeMethods"":[],""extra"":null}"; + var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""extra"":null}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(manifest.ToString(), json); @@ -22,7 +22,7 @@ public void ParseFromJson_Default() [TestMethod] public void ParseFromJson_Features() { - var json = @"{""groups"":[],""features"":{""storage"":true,""payable"":true},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safeMethods"":[],""extra"":null}"; + var json = @"{""groups"":[],""features"":{""storage"":true,""payable"":true},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""extra"":null}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(manifest.ToJson().ToString(), json); @@ -34,7 +34,7 @@ public void ParseFromJson_Features() [TestMethod] public void ParseFromJson_Permissions() { - var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""0x0000000000000000000000000000000000000000"",""methods"":[""method1"",""method2""]}],""trusts"":[],""safeMethods"":[],""extra"":null}"; + var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""0x0000000000000000000000000000000000000000"",""methods"":[""method1"",""method2""]}],""trusts"":[],""safemethods"":[],""extra"":null}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(manifest.ToString(), json); @@ -53,7 +53,7 @@ public void ParseFromJson_Permissions() [TestMethod] public void ParseFromJson_SafeMethods() { - var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safeMethods"":[""balanceOf""],""extra"":null}"; + var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[""balanceOf""],""extra"":null}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(manifest.ToString(), json); @@ -65,7 +65,7 @@ public void ParseFromJson_SafeMethods() [TestMethod] public void ParseFromJson_Trust() { - var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[""0x0000000000000000000000000000000000000001""],""safeMethods"":[],""extra"":null}"; + var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[""0x0000000000000000000000000000000000000001""],""safemethods"":[],""extra"":null}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(manifest.ToString(), json); @@ -77,7 +77,7 @@ public void ParseFromJson_Trust() [TestMethod] public void ParseFromJson_Groups() { - var json = @"{""groups"":[{""pubKey"":""03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c"",""signature"":""QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==""}],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safeMethods"":[],""extra"":null}"; + var json = @"{""groups"":[{""pubkey"":""03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c"",""signature"":""QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==""}],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""extra"":null}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(manifest.ToString(), json); @@ -89,7 +89,7 @@ public void ParseFromJson_Groups() [TestMethod] public void ParseFromJson_Extra() { - var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safeMethods"":[],""extra"":{""key"":""value""}}"; + var json = @"{""groups"":[],""features"":{""storage"":false,""payable"":false},""abi"":{""hash"":""0x0000000000000000000000000000000000000000"",""methods"":[],""events"":[]},""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""extra"":{""key"":""value""}}"; var manifest = ContractManifest.Parse(json); Assert.AreEqual(json, json); Assert.AreEqual("value", manifest.Extra["key"].AsString(), false); diff --git a/tests/neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs b/tests/neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs index addfc5b54e..e2cb70b11a 100644 --- a/tests/neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs +++ b/tests/neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs @@ -83,7 +83,7 @@ public void TestFromJson() json["address"] = "NdtB8RXRmJ7Nhw1FPTm7E6HoDZGnDw37nf"; json["key"] = null; json["label"] = null; - json["isDefault"] = true; + json["isdefault"] = true; json["lock"] = false; json["contract"] = null; json["extra"] = null; @@ -138,7 +138,7 @@ public void TestToJson() JObject json = _account.ToJson(); json["address"].Should().Equals("AZk5bAanTtD6AvpeesmYgL8CLRYUt5JQsX"); json["label"].Should().BeNull(); - json["isDefault"].ToString().Should().Be("false"); + json["isdefault"].ToString().Should().Be("false"); json["lock"].ToString().Should().Be("false"); json["key"].Should().BeNull(); json["contract"]["script"].ToString().Should().Be(@"""IQNgPziA63rqCtRQCJOSXkpC/qSKRO5viYoQs8fOBdKiZ6w=""");