diff --git a/src/neo/SmartContract/BinarySerializer.cs b/src/neo/SmartContract/BinarySerializer.cs
index 3f4d9b44bd..5083be59a7 100644
--- a/src/neo/SmartContract/BinarySerializer.cs
+++ b/src/neo/SmartContract/BinarySerializer.cs
@@ -50,7 +50,7 @@ private static StackItem Deserialize(BinaryReader reader, uint maxArraySize, uin
case StackItemType.Integer:
deserialized.Push(new BigInteger(reader.ReadVarBytes(Integer.MaxSize)));
break;
- case StackItemType.ByteArray:
+ case StackItemType.ByteString:
deserialized.Push(reader.ReadVarBytes((int)maxItemSize));
break;
case StackItemType.Buffer:
@@ -142,7 +142,7 @@ private static void Serialize(StackItem item, BinaryWriter writer, uint maxSize)
case Integer integer:
writer.WriteVarBytes(integer.Span);
break;
- case ByteArray bytes:
+ case ByteString bytes:
writer.WriteVarBytes(bytes.Span);
break;
case Buffer buffer:
diff --git a/src/neo/SmartContract/JsonSerializer.cs b/src/neo/SmartContract/JsonSerializer.cs
index 8bf3e6758f..375709a13d 100644
--- a/src/neo/SmartContract/JsonSerializer.cs
+++ b/src/neo/SmartContract/JsonSerializer.cs
@@ -27,7 +27,7 @@ public static JObject Serialize(StackItem item)
{
return array.Select(p => Serialize(p)).ToArray();
}
- case ByteArray buffer:
+ case ByteString buffer:
{
return Convert.ToBase64String(buffer.GetSpan());
}
@@ -87,7 +87,7 @@ public static byte[] SerializeToByteArray(StackItem item, uint maxSize)
case JsonTokenType.EndArray:
writer.WriteEndArray();
break;
- case ByteArray buffer:
+ case ByteString buffer:
writer.WriteStringValue(Convert.ToBase64String(buffer.GetSpan()));
break;
case Integer num:
diff --git a/src/neo/VM/Helper.cs b/src/neo/VM/Helper.cs
index 675d4be0d1..db17011eff 100644
--- a/src/neo/VM/Helper.cs
+++ b/src/neo/VM/Helper.cs
@@ -260,7 +260,7 @@ private static ContractParameter ToParameter(StackItem item, List<(StackItem, Co
Value = item.ToBoolean()
};
break;
- case ByteArray array:
+ case ByteString array:
parameter = new ContractParameter
{
Type = ContractParameterType.ByteArray,
diff --git a/src/neo/neo.csproj b/src/neo/neo.csproj
index 465438721a..41d80ba88c 100644
--- a/src/neo/neo.csproj
+++ b/src/neo/neo.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/tests/neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs b/tests/neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs
index 4a04d97c84..70098c9c04 100644
--- a/tests/neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs
+++ b/tests/neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs
@@ -166,7 +166,7 @@ public static string Symbol(this NativeContract contract)
engine.Execute().Should().Be(VMState.HALT);
var result = engine.ResultStack.Pop();
- result.Should().BeOfType(typeof(VM.Types.ByteArray));
+ result.Should().BeOfType(typeof(VM.Types.ByteString));
return result.GetString();
}
@@ -186,7 +186,7 @@ public static string Name(this NativeContract contract)
engine.Execute().Should().Be(VMState.HALT);
var result = engine.ResultStack.Pop();
- result.Should().BeOfType(typeof(VM.Types.ByteArray));
+ result.Should().BeOfType(typeof(VM.Types.ByteString));
return result.GetString();
}
diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs
index d8fd144812..72c4750225 100644
--- a/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs
+++ b/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs
@@ -13,7 +13,7 @@ public class UT_PrimitiveWrapper
[TestMethod]
public void TestGeneratorAndDispose()
{
- ByteArrayWrapper arrayWrapper = new ByteArrayWrapper(new ByteArray(new byte[0]));
+ ByteArrayWrapper arrayWrapper = new ByteArrayWrapper(new ByteString(new byte[0]));
Assert.IsNotNull(arrayWrapper);
Action action = () => arrayWrapper.Dispose();
action.Should().NotThrow();
diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_StorageIterator.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_StorageIterator.cs
index a0126b3b03..72cb823d70 100644
--- a/tests/neo.UnitTests/SmartContract/Iterators/UT_StorageIterator.cs
+++ b/tests/neo.UnitTests/SmartContract/Iterators/UT_StorageIterator.cs
@@ -31,8 +31,8 @@ public void TestKeyAndValueAndNext()
list.Add((storageKey, storageItem));
StorageIterator storageIterator = new StorageIterator(list.GetEnumerator());
storageIterator.Next();
- Assert.AreEqual(new ByteArray(new byte[1]), storageIterator.Key());
- Assert.AreEqual(new ByteArray(new byte[1]), storageIterator.Value());
+ Assert.AreEqual(new ByteString(new byte[1]), storageIterator.Key());
+ Assert.AreEqual(new ByteString(new byte[1]), storageIterator.Value());
}
}
}
diff --git a/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs b/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
index 6533b07541..ad17dffb28 100644
--- a/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
+++ b/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
@@ -690,7 +690,7 @@ internal static void CheckBalance(byte[] account, DataCache u.GetType()).ToArray().Should().BeEquivalentTo(new Type[] { typeof(VM.Types.Integer), typeof(VM.Types.Integer), typeof(VM.Types.ByteArray) }); // Balance
+ st.Select(u => u.GetType()).ToArray().Should().BeEquivalentTo(new Type[] { typeof(VM.Types.Integer), typeof(VM.Types.Integer), typeof(VM.Types.ByteString) }); // Balance
st[0].GetBigInteger().Should().Be(balance); // Balance
st[1].GetBigInteger().Should().Be(height); // BalanceHeight
diff --git a/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs b/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
index 2252e60d8a..bbcbcd9d1d 100644
--- a/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
+++ b/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
@@ -49,13 +49,13 @@ public void TestInvoke()
sb2.EmitSysCall("test".ToInteropMethodHash());
engine2.LoadScript(sb2.ToArray());
- ByteArray method1 = new ByteArray(System.Text.Encoding.Default.GetBytes("wrongMethod"));
+ ByteString method1 = new ByteString(System.Text.Encoding.Default.GetBytes("wrongMethod"));
VMArray args1 = new VMArray();
engine2.CurrentContext.EvaluationStack.Push(args1);
engine2.CurrentContext.EvaluationStack.Push(method1);
testNativeContract.Invoke(engine2).Should().BeFalse();
- ByteArray method2 = new ByteArray(System.Text.Encoding.Default.GetBytes("onPersist"));
+ ByteString method2 = new ByteString(System.Text.Encoding.Default.GetBytes("onPersist"));
VMArray args2 = new VMArray();
engine2.CurrentContext.EvaluationStack.Push(args2);
engine2.CurrentContext.EvaluationStack.Push(method2);
diff --git a/tests/neo.UnitTests/SmartContract/UT_BinarySerializer.cs b/tests/neo.UnitTests/SmartContract/UT_BinarySerializer.cs
index 39330334d9..e5c0b0063d 100644
--- a/tests/neo.UnitTests/SmartContract/UT_BinarySerializer.cs
+++ b/tests/neo.UnitTests/SmartContract/UT_BinarySerializer.cs
@@ -76,7 +76,7 @@ public void TestSerialize()
[TestMethod]
public void TestDeserializeStackItem()
{
- StackItem stackItem1 = new ByteArray(new byte[5]);
+ StackItem stackItem1 = new ByteString(new byte[5]);
byte[] byteArray1 = BinarySerializer.Serialize(stackItem1, MaxItemSize);
StackItem result1 = BinarySerializer.Deserialize(byteArray1, 2048, (uint)byteArray1.Length);
Assert.AreEqual(stackItem1, result1);
diff --git a/tests/neo.UnitTests/SmartContract/UT_InteropService.cs b/tests/neo.UnitTests/SmartContract/UT_InteropService.cs
index fb8d668c10..27fd3abd46 100644
--- a/tests/neo.UnitTests/SmartContract/UT_InteropService.cs
+++ b/tests/neo.UnitTests/SmartContract/UT_InteropService.cs
@@ -471,7 +471,7 @@ public void TestBlockchain_GetContract()
InteropService.Invoke(engine, InteropService.Blockchain.GetContract).Should().BeTrue();
var stackItems = ((VM.Types.Array)engine.CurrentContext.EvaluationStack.Pop()).ToArray();
stackItems.Length.Should().Be(3);
- stackItems[0].GetType().Should().Be(typeof(ByteArray));
+ stackItems[0].GetType().Should().Be(typeof(ByteString));
stackItems[0].GetSpan().ToHexString().Should().Be(state.Script.ToHexString());
stackItems[1].ToBoolean().Should().BeFalse();
stackItems[2].ToBoolean().Should().BeFalse();
diff --git a/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs b/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs
index 442450f844..f7d80a4d84 100644
--- a/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs
+++ b/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs
@@ -95,7 +95,7 @@ public void System_Blockchain_GetBlock()
Assert.AreEqual(engine.Execute(), VMState.HALT);
Assert.AreEqual(1, engine.ResultStack.Count);
- Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteArray));
+ Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteString));
Assert.AreEqual(engine.ResultStack.Pop().GetSpan().ToHexString(),
"5b22366b4139757552614430373634585358466c706674686b436b5954702f6e34623878715057476c6a6659303d222c332c22414141414141414141414141414141414141414141414141414141414141414141414141414141414141413d222c22414141414141414141414141414141414141414141414141414141414141414141414141414141414141413d222c322c302c224141414141414141414141414141414141414141414141414141413d222c315d");
Assert.AreEqual(0, engine.ResultStack.Count);
@@ -194,11 +194,11 @@ public void Json_Serialize()
Assert.AreEqual(engine.Execute(), VMState.HALT);
Assert.AreEqual(5, engine.ResultStack.Count);
- Assert.IsTrue(engine.ResultStack.TryPop(out var m) && m.GetString() == "{\"key\":\"dmFsdWU=\"}");
- Assert.IsTrue(engine.ResultStack.TryPop(out var n) && n.GetString() == "null");
- Assert.IsTrue(engine.ResultStack.TryPop(out var s) && s.GetString() == "\"dGVzdA==\"");
- Assert.IsTrue(engine.ResultStack.TryPop(out var b) && b.GetString() == "true");
- Assert.IsTrue(engine.ResultStack.TryPop(out var i) && i.GetString() == "5");
+ Assert.IsTrue(engine.ResultStack.TryPop(out var m) && m.GetString() == "{\"key\":\"dmFsdWU=\"}");
+ Assert.IsTrue(engine.ResultStack.TryPop(out var n) && n.GetString() == "null");
+ Assert.IsTrue(engine.ResultStack.TryPop(out var s) && s.GetString() == "\"dGVzdA==\"");
+ Assert.IsTrue(engine.ResultStack.TryPop(out var b) && b.GetString() == "true");
+ Assert.IsTrue(engine.ResultStack.TryPop(out var i) && i.GetString() == "5");
}
}
@@ -259,7 +259,7 @@ public void System_ExecutionEngine_GetScriptContainer()
Assert.AreEqual(engine.Execute(), VMState.HALT);
Assert.AreEqual(1, engine.ResultStack.Count);
- Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteArray));
+ Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteString));
Assert.AreEqual(engine.ResultStack.Pop().GetSpan().ToHexString(),
@"5b225c75303032426b53415959527a4c4b69685a676464414b50596f754655737a63544d7867445a6572584a3172784c37303d222c362c342c222f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f383d222c332c322c352c2241513d3d225d");
Assert.AreEqual(0, engine.ResultStack.Count);
diff --git a/tests/neo.UnitTests/VM/UT_Helper.cs b/tests/neo.UnitTests/VM/UT_Helper.cs
index 1a749bc567..64e36f194f 100644
--- a/tests/neo.UnitTests/VM/UT_Helper.cs
+++ b/tests/neo.UnitTests/VM/UT_Helper.cs
@@ -518,7 +518,7 @@ private void TestToParameter2Integer()
private void TestToParameter2ByteArray()
{
- StackItem item = new VM.Types.ByteArray(new byte[] { 0x00 });
+ StackItem item = new VM.Types.ByteString(new byte[] { 0x00 });
ContractParameter parameter = VM.Helper.ToParameter(item);
Assert.AreEqual(ContractParameterType.ByteArray, parameter.Type);
Assert.AreEqual(Encoding.Default.GetString(new byte[] { 0x00 }), Encoding.Default.GetString((byte[])parameter.Value));