Skip to content

Commit a094813

Browse files
shargonJim8yNGDAdmin
authored andcommitted
Clean JsonSerializer (neo-project#4113)
* Remove unused method * Obsolete * Update src/Neo/SmartContract/JsonSerializer.cs Co-authored-by: Jimmy <[email protected]> --------- Co-authored-by: Jimmy <[email protected]> Co-authored-by: NGD Admin <[email protected]>
1 parent df4b205 commit a094813

File tree

2 files changed

+1
-87
lines changed

2 files changed

+1
-87
lines changed

src/Neo/SmartContract/JsonSerializer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public static class JsonSerializer
3636
/// </summary>
3737
/// <param name="item">The <see cref="StackItem"/> to serialize.</param>
3838
/// <returns>The serialized object.</returns>
39+
[Obsolete("This method will be removed in the future, do not use.")]
3940
public static JToken Serialize(StackItem item)
4041
{
4142
switch (item)

tests/Neo.UnitTests/SmartContract/UT_JsonSerializer.cs

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,6 @@ public void JsonTest_Array()
7272
Assert.AreEqual("[1,\"a==\",-1.3,null]", parsed.ToString());
7373
}
7474

75-
[TestMethod]
76-
public void JsonTest_Serialize_Map_Test()
77-
{
78-
var entry = new Map
79-
{
80-
[new byte[] { 0xC1 }] = 1,
81-
[new byte[] { 0xC2 }] = 2,
82-
};
83-
Assert.ThrowsExactly<DecoderFallbackException>(() => _ = JsonSerializer.Serialize(entry));
84-
}
85-
8675
[TestMethod]
8776
public void JsonTest_Bool()
8877
{
@@ -210,34 +199,6 @@ public void Deserialize_WrongJson()
210199
Assert.ThrowsExactly<FormatException>(() => _ = JsonSerializer.Deserialize(engine, JObject.Parse("x"), ExecutionEngineLimits.Default));
211200
}
212201

213-
[TestMethod]
214-
public void Serialize_WrongJson()
215-
{
216-
Assert.ThrowsExactly<FormatException>(() => _ = JsonSerializer.Serialize(StackItem.FromInterface(new object())));
217-
}
218-
219-
[TestMethod]
220-
public void Serialize_EmptyObject()
221-
{
222-
var entry = new Map();
223-
var json = JsonSerializer.Serialize(entry).ToString();
224-
225-
Assert.AreEqual("{}", json);
226-
}
227-
228-
[TestMethod]
229-
public void Serialize_Number()
230-
{
231-
var entry = new Array { 1, 9007199254740992 };
232-
Assert.ThrowsExactly<InvalidOperationException>(() => _ = JsonSerializer.Serialize(entry));
233-
}
234-
235-
[TestMethod]
236-
public void Serialize_Null()
237-
{
238-
Assert.AreEqual(JObject.Null, JsonSerializer.Serialize(StackItem.Null));
239-
}
240-
241202
[TestMethod]
242203
public void Deserialize_EmptyObject()
243204
{
@@ -249,15 +210,6 @@ public void Deserialize_EmptyObject()
249210
Assert.IsEmpty((Map)items);
250211
}
251212

252-
[TestMethod]
253-
public void Serialize_EmptyArray()
254-
{
255-
var entry = new Array();
256-
var json = JsonSerializer.Serialize(entry).ToString();
257-
258-
Assert.AreEqual("[]", json);
259-
}
260-
261213
[TestMethod]
262214
public void Deserialize_EmptyArray()
263215
{
@@ -269,21 +221,6 @@ public void Deserialize_EmptyArray()
269221
Assert.IsEmpty((Array)items);
270222
}
271223

272-
[TestMethod]
273-
public void Serialize_Map_Test()
274-
{
275-
var entry = new Map
276-
{
277-
["test1"] = 1,
278-
["test3"] = 3,
279-
["test2"] = 2
280-
};
281-
282-
var json = JsonSerializer.Serialize(entry).ToString();
283-
284-
Assert.AreEqual("{\"test1\":1,\"test3\":3,\"test2\":2}", json);
285-
}
286-
287224
[TestMethod]
288225
public void Deserialize_Map_Test()
289226
{
@@ -305,16 +242,6 @@ public void Deserialize_Map_Test()
305242
CollectionAssert.AreEqual(map.Values.Select(u => u.GetInteger()).ToArray(), new BigInteger[] { 123, 321 });
306243
}
307244

308-
[TestMethod]
309-
public void Serialize_Array_Bool_Str_Num()
310-
{
311-
var entry = new Array { true, "test", 123 };
312-
313-
var json = JsonSerializer.Serialize(entry).ToString();
314-
315-
Assert.AreEqual("[true,\"test\",123]", json);
316-
}
317-
318245
[TestMethod]
319246
public void Deserialize_Array_Bool_Str_Num()
320247
{
@@ -333,20 +260,6 @@ public void Deserialize_Array_Bool_Str_Num()
333260
Assert.AreEqual(array[3].GetInteger(), BigInteger.Parse("90500000000000000000000000000"));
334261
}
335262

336-
[TestMethod]
337-
public void Serialize_Array_OfArray()
338-
{
339-
var entry = new Array
340-
{
341-
new Array { true, "test1", 123 },
342-
new Array { true, "test2", 321 }
343-
};
344-
345-
var json = JsonSerializer.Serialize(entry).ToString();
346-
347-
Assert.AreEqual("[[true,\"test1\",123],[true,\"test2\",321]]", json);
348-
}
349-
350263
[TestMethod]
351264
public void Deserialize_Array_OfArray()
352265
{

0 commit comments

Comments
 (0)