From 63f97311e34f69d7a8ed372b8bf4b4659f4ecc62 Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 21 Jan 2021 10:19:03 +0100 Subject: [PATCH] Revert and Test --- src/neo/SmartContract/Manifest/ContractManifest.cs | 2 +- .../SmartContract/Manifest/UT_ContractManifest.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/neo/SmartContract/Manifest/ContractManifest.cs b/src/neo/SmartContract/Manifest/ContractManifest.cs index 74f3bec187..6f99694080 100644 --- a/src/neo/SmartContract/Manifest/ContractManifest.cs +++ b/src/neo/SmartContract/Manifest/ContractManifest.cs @@ -82,7 +82,7 @@ public StackItem ToStackItem(ReferenceCounter referenceCounter) Abi.ToStackItem(referenceCounter), new Array(referenceCounter, Permissions.Select(p => p.ToStackItem(referenceCounter))), Trusts.IsWildcard ? StackItem.Null : new Array(referenceCounter, Trusts.Select(p => (StackItem)p.ToArray())), - Extra is null ? StackItem.Null : Extra.ToByteArray(false) + Extra is null ? "null" : Extra.ToByteArray(false) }; } diff --git a/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs b/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs index 4ac65bf169..df448e2e8a 100644 --- a/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs +++ b/tests/neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs @@ -92,8 +92,15 @@ public void TestDeserializeAndSerialize() var clone = new ContractManifest(); ((IInteroperable)clone).FromStackItem(expected.ToStackItem(null)); - Assert.AreEqual(expected.ToString(), clone.ToString()); Assert.AreEqual(expected.Extra.ToString(), @"{""a"":123}"); + Assert.AreEqual(expected.ToString(), clone.ToString()); + + expected.Extra = null; + clone = new ContractManifest(); + ((IInteroperable)clone).FromStackItem(expected.ToStackItem(null)); + + Assert.AreEqual(expected.Extra, clone.Extra); + Assert.AreEqual(expected.ToString(), clone.ToString()); } [TestMethod]