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

Remove FromJson #1625

Merged
merged 1 commit into from
May 3, 2020
Merged

Remove FromJson #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions src/neo/Network/P2P/Payloads/Block.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,6 @@ public override JObject ToJson()
return json;
}

public new static Block FromJson(JObject json)
{
Block block = new Block();
BlockBase blockBase = block;
blockBase.FromJson(json);
block.ConsensusData = ConsensusData.FromJson(json["consensus_data"]);
block.Transactions = ((JArray)json["tx"]).Select(p => Transaction.FromJson(p)).ToArray();
return block;
}

public TrimmedBlock Trim()
{
return new TrimmedBlock
Expand Down
12 changes: 0 additions & 12 deletions src/neo/Network/P2P/Payloads/BlockBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Neo.Wallets;
using System;
using System.IO;
using System.Linq;

namespace Neo.Network.P2P.Payloads
{
Expand Down Expand Up @@ -113,17 +112,6 @@ public virtual JObject ToJson()
return json;
}

public void FromJson(JObject json)
{
Version = (uint)json["version"].AsNumber();
PrevHash = UInt256.Parse(json["previousblockhash"].AsString());
MerkleRoot = UInt256.Parse(json["merkleroot"].AsString());
Timestamp = (ulong)json["time"].AsNumber();
Index = (uint)json["index"].AsNumber();
NextConsensus = json["nextconsensus"].AsString().ToScriptHash();
Witness = ((JArray)json["witnesses"]).Select(p => Witness.FromJson(p)).FirstOrDefault();
}

public virtual bool Verify(StoreView snapshot)
{
Header prev_header = snapshot.GetHeader(PrevHash);
Expand Down
10 changes: 0 additions & 10 deletions src/neo/Network/P2P/Payloads/ConsensusData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Neo.IO;
using Neo.IO.Json;
using Neo.Ledger;
using System.Globalization;
using System.IO;

namespace Neo.Network.P2P.Payloads
Expand Down Expand Up @@ -46,14 +45,5 @@ public JObject ToJson()
json["nonce"] = Nonce.ToString("x16");
return json;
}

public static ConsensusData FromJson(JObject json)
{
ConsensusData block = new ConsensusData();
block.PrimaryIndex = (uint)json["primary"].AsNumber();
block.Nonce = ulong.Parse(json["nonce"].AsString(), NumberStyles.HexNumber);
return block;
}

}
}
12 changes: 0 additions & 12 deletions src/neo/Network/P2P/Payloads/Cosigner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Neo.Cryptography.ECC;
using Neo.IO;
using Neo.IO.Json;
using System;
using System.IO;
using System.Linq;

Expand Down Expand Up @@ -61,16 +60,5 @@ public JObject ToJson()
json["allowedGroups"] = AllowedGroups.Select(p => (JObject)p.ToString()).ToArray();
return json;
}

public static Cosigner FromJson(JObject json)
{
return new Cosigner
{
Account = UInt160.Parse(json["account"].AsString()),
Scopes = (WitnessScope)Enum.Parse(typeof(WitnessScope), json["scopes"].AsString()),
AllowedContracts = ((JArray)json["allowedContracts"])?.Select(p => UInt160.Parse(p.AsString())).ToArray(),
AllowedGroups = ((JArray)json["allowedGroups"])?.Select(p => ECPoint.Parse(p.AsString(), ECCurve.Secp256r1)).ToArray()
};
}
}
}
10 changes: 0 additions & 10 deletions src/neo/Network/P2P/Payloads/Header.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Neo.IO.Json;
using Neo.Ledger;
using System;
using System.IO;
Expand Down Expand Up @@ -52,14 +51,5 @@ public TrimmedBlock Trim()
Hashes = new UInt256[0]
};
}

public new static Header FromJson(JObject json)
{
Header header = new Header();
BlockBase blockBase = header;
blockBase.FromJson(json);
return header;
}

}
}
16 changes: 0 additions & 16 deletions src/neo/Network/P2P/Payloads/Transaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,22 +249,6 @@ public JObject ToJson()
return json;
}

public static Transaction FromJson(JObject json)
{
Transaction tx = new Transaction();
tx.Version = byte.Parse(json["version"].AsString());
tx.Nonce = uint.Parse(json["nonce"].AsString());
tx.Sender = json["sender"].AsString().ToScriptHash();
tx.SystemFee = long.Parse(json["sys_fee"].AsString());
tx.NetworkFee = long.Parse(json["net_fee"].AsString());
tx.ValidUntilBlock = uint.Parse(json["valid_until_block"].AsString());
tx.Attributes = ((JArray)json["attributes"]).Select(p => TransactionAttribute.FromJson(p)).ToArray();
tx.Cosigners = ((JArray)json["cosigners"]).Select(p => Cosigner.FromJson(p)).ToArray();
tx.Script = Convert.FromBase64String(json["script"].AsString());
tx.Witnesses = ((JArray)json["witnesses"]).Select(p => Witness.FromJson(p)).ToArray();
return tx;
}

bool IInventory.Verify(StoreView snapshot)
{
return Verify(snapshot, BigInteger.Zero) == VerifyResult.Succeed;
Expand Down
10 changes: 0 additions & 10 deletions src/neo/Network/P2P/Payloads/TransactionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,5 @@ public JObject ToJson()
json["data"] = Convert.ToBase64String(Data);
return json;
}

public static TransactionAttribute FromJson(JObject json)
{
TransactionAttribute transactionAttribute = new TransactionAttribute();
transactionAttribute.Usage = (TransactionAttributeUsage)byte.Parse(json["usage"].AsString());
if (!Enum.IsDefined(typeof(TransactionAttributeUsage), transactionAttribute.Usage))
throw new ArgumentException();
transactionAttribute.Data = Convert.FromBase64String(json["data"].AsString());
return transactionAttribute;
}
}
}
8 changes: 0 additions & 8 deletions src/neo/Network/P2P/Payloads/Witness.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,5 @@ public JObject ToJson()
json["verification"] = Convert.ToBase64String(VerificationScript);
return json;
}

public static Witness FromJson(JObject json)
{
Witness witness = new Witness();
witness.InvocationScript = Convert.FromBase64String(json["invocation"].AsString());
witness.VerificationScript = Convert.FromBase64String(json["verification"].AsString());
return witness;
}
}
}
23 changes: 0 additions & 23 deletions tests/neo.UnitTests/Network/P2P/Payloads/UT_Cosigner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Cryptography.ECC;
using Neo.IO;
using Neo.IO.Json;
using Neo.Network.P2P.Payloads;

namespace Neo.UnitTests.Network.P2P.Payloads
Expand Down Expand Up @@ -97,11 +96,6 @@ public void Json_Global()

var json = "{\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"Global\"}";
attr.ToJson().ToString().Should().Be(json);

var copy = Cosigner.FromJson(JObject.Parse(json));

Assert.AreEqual(attr.Scopes, copy.Scopes);
Assert.AreEqual(attr.Account, copy.Account);
}

[TestMethod]
Expand All @@ -115,11 +109,6 @@ public void Json_CalledByEntry()

var json = "{\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CalledByEntry\"}";
attr.ToJson().ToString().Should().Be(json);

var copy = Cosigner.FromJson(JObject.Parse(json));

Assert.AreEqual(attr.Scopes, copy.Scopes);
Assert.AreEqual(attr.Account, copy.Account);
}

[TestMethod]
Expand All @@ -134,12 +123,6 @@ public void Json_CustomContracts()

var json = "{\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CustomContracts\",\"allowedContracts\":[\"0x0000000000000000000000000000000000000000\"]}";
attr.ToJson().ToString().Should().Be(json);

var copy = Cosigner.FromJson(JObject.Parse(json));

Assert.AreEqual(attr.Scopes, copy.Scopes);
CollectionAssert.AreEqual(attr.AllowedContracts, copy.AllowedContracts);
Assert.AreEqual(attr.Account, copy.Account);
}

[TestMethod]
Expand All @@ -154,12 +137,6 @@ public void Json_CustomGroups()

var json = "{\"account\":\"0x0000000000000000000000000000000000000000\",\"scopes\":\"CustomGroups\",\"allowedGroups\":[\"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c\"]}";
attr.ToJson().ToString().Should().Be(json);

var copy = Cosigner.FromJson(JObject.Parse(json));

Assert.AreEqual(attr.Scopes, copy.Scopes);
CollectionAssert.AreEqual(attr.AllowedGroups, copy.AllowedGroups);
Assert.AreEqual(attr.Account, copy.Account);
}
}
}