Skip to content

Commit

Permalink
Change json fields to all lower case for consistency (neo-project#1736)
Browse files Browse the repository at this point in the history
  • Loading branch information
@joeqian10 @ShawnYun
joeqian10 authored and ShawnYun committed Jul 6, 2020
1 parent 36c024b commit 49b713d
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/neo/Ledger/TrimmedBlock.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/neo/Network/P2P/Payloads/Block.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/neo/Network/P2P/Payloads/Cosigner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/neo/Network/P2P/Payloads/Transaction.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/neo/SmartContract/Manifest/ContractGroup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
};
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/neo/SmartContract/Manifest/ContractManifest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -158,7 +158,7 @@ private void DeserializeFromJson(JObject json)
Features = ContractFeatures.NoProperty;
Permissions = ((JArray)json["permissions"]).Select(u => ContractPermission.FromJson(u)).ToArray();
Trusts = WildcardContainer<UInt160>.FromJson(json["trusts"], u => UInt160.Parse(u.AsString()));
SafeMethods = WildcardContainer<string>.FromJson(json["safeMethods"], u => u.AsString());
SafeMethods = WildcardContainer<string>.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;
Expand Down
4 changes: 2 additions & 2 deletions src/neo/SmartContract/Manifest/ContractMethodDescriptor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ 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()),
};
}

public override JObject ToJson()
{
var json = base.ToJson();
json["offset"] = Offset;
json["returnType"] = ReturnType.ToString();
json["returntype"] = ReturnType.ToString();
return json;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/neo/Wallets/NEP6/NEP6Account.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion tests/neo.UnitTests/Network/P2P/Payloads/UT_Block.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
}
4 changes: 2 additions & 2 deletions tests/neo.UnitTests/Network/P2P/Payloads/UT_Cosigner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
}
14 changes: 7 additions & 7 deletions tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tests/neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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=""");
Expand Down

0 comments on commit 49b713d

Please sign in to comment.