Upgrade dependencies and target frameworks

.travis.yml

@@ -2,22 +2,17 @@ language: csharp
 
 os:
  - linux
- - osx
 
 dist: bionic
-osx_image: xcode9.1
-
 mono: none
-dotnet: 2.2.402
+dotnet: 3.0.100
 
 env:
   - TEST_SUITE="without-cultures"
   - TEST_SUITE="cultures"
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ulimit -n 2048; fi
 install:
-  - dotnet tool install -g dotnet-format --version 4.0.40103 --add-source https://dotnet.myget.org/F/format/api/v3/index.json
+  - dotnet tool install -g dotnet-format
   - export PATH="$PATH:$HOME/.dotnet/tools"
   - dotnet-format --version
 before_script:
@@ -28,7 +23,7 @@ script: |
   if [[ "$TEST_SUITE" == "cultures" ]]; then
       dotnet test -v m --filter FullyQualifiedName=Neo.UnitTests.UT_Culture.All_Tests_Cultures
   else
-      if [[ "$TEST_SUITE" == "without-cultures" && "$TRAVIS_OS_NAME" == "linux" ]]; then
+      if [[ "$TEST_SUITE" == "without-cultures" ]]; then
         # Test & Calculate coverage
         find * -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild
         dotnet test -v m --filter FullyQualifiedName!=Neo.UnitTests.UT_Culture.All_Tests_Cultures /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
@@ -38,7 +33,7 @@ script: |
       fi
   fi
 after_success: |
-  if [[ "$TEST_SUITE" == "without-cultures" && "$TRAVIS_OS_NAME" == "linux" ]]; then
+  if [[ "$TEST_SUITE" == "without-cultures" ]]; then
     # Send coverage
     echo "Test Success - Branch($TRAVIS_BRANCH) Pull Request($TRAVIS_PULL_REQUEST) Tag($TRAVIS_TAG)"
     bash <(curl -s https://codecov.io/bash) -v

neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs

@@ -86,7 +86,7 @@ public static string[] SupportedStandards(this NativeContract contract)
             result.Should().BeOfType(typeof(VM.Types.Array));
 
             return (result as VM.Types.Array).ToArray()
-                .Select(u => Encoding.ASCII.GetString(u.GetByteArray()))
+                .Select(u => Encoding.ASCII.GetString(u.GetByteArray().Span))
                 .ToArray();
         }
 
@@ -168,7 +168,7 @@ public static string Symbol(this NativeContract contract)
             var result = engine.ResultStack.Pop();
             result.Should().BeOfType(typeof(VM.Types.ByteArray));
 
-            return Encoding.UTF8.GetString((result as VM.Types.ByteArray).GetByteArray());
+            return Encoding.UTF8.GetString(result.GetByteArray().Span);
         }
 
         public static string Name(this NativeContract contract)
@@ -188,7 +188,7 @@ public static string Name(this NativeContract contract)
             var result = engine.ResultStack.Pop();
             result.Should().BeOfType(typeof(VM.Types.ByteArray));
 
-            return Encoding.UTF8.GetString((result as VM.Types.ByteArray).GetByteArray());
+            return Encoding.UTF8.GetString(result.GetByteArray().Span);
         }
     }
 }

neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs

@@ -282,13 +282,13 @@ public void TestGetNextBlockValidators1()
                 var result = engine.ResultStack.Peek();
                 result.GetType().Should().Be(typeof(VM.Types.Array));
                 ((VM.Types.Array)result).Count.Should().Be(7);
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[0]).GetByteArray().ToHexString().Should().Be("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[1]).GetByteArray().ToHexString().Should().Be("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[2]).GetByteArray().ToHexString().Should().Be("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[3]).GetByteArray().ToHexString().Should().Be("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[4]).GetByteArray().ToHexString().Should().Be("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[5]).GetByteArray().ToHexString().Should().Be("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[6]).GetByteArray().ToHexString().Should().Be("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70");
+                ((VM.Types.Array)result)[0].GetByteArray().Span.ToHexString().Should().Be("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c");
+                ((VM.Types.Array)result)[1].GetByteArray().Span.ToHexString().Should().Be("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093");
+                ((VM.Types.Array)result)[2].GetByteArray().Span.ToHexString().Should().Be("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a");
+                ((VM.Types.Array)result)[3].GetByteArray().Span.ToHexString().Should().Be("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554");
+                ((VM.Types.Array)result)[4].GetByteArray().Span.ToHexString().Should().Be("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d");
+                ((VM.Types.Array)result)[5].GetByteArray().Span.ToHexString().Should().Be("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e");
+                ((VM.Types.Array)result)[6].GetByteArray().Span.ToHexString().Should().Be("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70");
             }
         }
 
@@ -323,19 +323,19 @@ public void TestGetRegisteredValidators1()
                 var result = engine.ResultStack.Peek();
                 result.GetType().Should().Be(typeof(VM.Types.Array));
                 ((VM.Types.Array)result).Count.Should().Be(7);
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[0])[0]).GetByteArray().ToHexString().Should().Be("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70");
+                ((VM.Types.Struct)((VM.Types.Array)result)[0])[0].GetByteArray().Span.ToHexString().Should().Be("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70");
                 ((VM.Types.Struct)((VM.Types.Array)result)[0])[1].GetBigInteger().Should().Be(new BigInteger(0));
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[1])[0]).GetByteArray().ToHexString().Should().Be("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d");
+                ((VM.Types.Struct)((VM.Types.Array)result)[1])[0].GetByteArray().Span.ToHexString().Should().Be("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d");
                 ((VM.Types.Struct)((VM.Types.Array)result)[1])[1].GetBigInteger().Should().Be(new BigInteger(0));
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[2])[0]).GetByteArray().ToHexString().Should().Be("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e");
+                ((VM.Types.Struct)((VM.Types.Array)result)[2])[0].GetByteArray().Span.ToHexString().Should().Be("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e");
                 ((VM.Types.Struct)((VM.Types.Array)result)[2])[1].GetBigInteger().Should().Be(new BigInteger(0));
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[3])[0]).GetByteArray().ToHexString().Should().Be("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554");
+                ((VM.Types.Struct)((VM.Types.Array)result)[3])[0].GetByteArray().Span.ToHexString().Should().Be("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554");
                 ((VM.Types.Struct)((VM.Types.Array)result)[3])[1].GetBigInteger().Should().Be(new BigInteger(0));
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[4])[0]).GetByteArray().ToHexString().Should().Be("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093");
+                ((VM.Types.Struct)((VM.Types.Array)result)[4])[0].GetByteArray().Span.ToHexString().Should().Be("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093");
                 ((VM.Types.Struct)((VM.Types.Array)result)[4])[1].GetBigInteger().Should().Be(new BigInteger(0));
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[5])[0]).GetByteArray().ToHexString().Should().Be("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c");
+                ((VM.Types.Struct)((VM.Types.Array)result)[5])[0].GetByteArray().Span.ToHexString().Should().Be("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c");
                 ((VM.Types.Struct)((VM.Types.Array)result)[5])[1].GetBigInteger().Should().Be(new BigInteger(0));
-                ((VM.Types.ByteArray)((VM.Types.Struct)((VM.Types.Array)result)[6])[0]).GetByteArray().ToHexString().Should().Be("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a");
+                ((VM.Types.Struct)((VM.Types.Array)result)[6])[0].GetByteArray().Span.ToHexString().Should().Be("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a");
                 ((VM.Types.Struct)((VM.Types.Array)result)[6])[1].GetBigInteger().Should().Be(new BigInteger(0));
             }
         }
@@ -377,13 +377,13 @@ public void TestGetValidators1()
                 var result = engine.ResultStack.Peek();
                 result.GetType().Should().Be(typeof(VM.Types.Array));
                 ((VM.Types.Array)result).Count.Should().Be(7);
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[0]).GetByteArray().ToHexString().Should().Be("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[1]).GetByteArray().ToHexString().Should().Be("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[2]).GetByteArray().ToHexString().Should().Be("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[3]).GetByteArray().ToHexString().Should().Be("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[4]).GetByteArray().ToHexString().Should().Be("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[5]).GetByteArray().ToHexString().Should().Be("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e");
-                ((VM.Types.ByteArray)((VM.Types.Array)result)[6]).GetByteArray().ToHexString().Should().Be("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70");
+                ((VM.Types.Array)result)[0].GetByteArray().Span.ToHexString().Should().Be("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c");
+                ((VM.Types.Array)result)[1].GetByteArray().Span.ToHexString().Should().Be("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093");
+                ((VM.Types.Array)result)[2].GetByteArray().Span.ToHexString().Should().Be("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a");
+                ((VM.Types.Array)result)[3].GetByteArray().Span.ToHexString().Should().Be("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554");
+                ((VM.Types.Array)result)[4].GetByteArray().Span.ToHexString().Should().Be("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d");
+                ((VM.Types.Array)result)[5].GetByteArray().Span.ToHexString().Should().Be("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e");
+                ((VM.Types.Array)result)[6].GetByteArray().Span.ToHexString().Should().Be("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70");
             }
         }
 
@@ -649,7 +649,7 @@ internal static ECPoint[] Check_GetValidators(Snapshot snapshot)
             var result = engine.ResultStack.Pop();
             result.Should().BeOfType(typeof(VM.Types.Array));
 
-            return (result as VM.Types.Array).Select(u => u.GetByteArray().AsSerializable<ECPoint>()).ToArray();
+            return (result as VM.Types.Array).Select(u => u.GetByteArray().Span.AsSerializable<ECPoint>()).ToArray();
         }
 
         internal static (BigInteger Value, bool State) Check_UnclaimedGas(Snapshot snapshot, byte[] address)
@@ -695,7 +695,7 @@ internal static void CheckBalance(byte[] account, DataCache<StorageKey, StorageI
 
             st[0].GetBigInteger().Should().Be(balance); // Balance
             st[1].GetBigInteger().Should().Be(height);  // BalanceHeight
-            (st[2].GetByteArray().AsSerializableArray<ECPoint>(Blockchain.MaxValidators)).Should().BeEquivalentTo(votes);  // Votes
+            (st[2].GetByteArray().Span.AsSerializableArray<ECPoint>(Blockchain.MaxValidators)).Should().BeEquivalentTo(votes);  // Votes
 
             trackable.Key.Key.Should().BeEquivalentTo(new byte[] { 20 }.Concat(account));
             trackable.Item.IsConstant.Should().Be(false);

neo.UnitTests/SmartContract/Native/UT_PolicyContract.cs

@@ -202,7 +202,7 @@ public void Check_Block_UnblockAccount()
             ret = NativeContract.Policy.Call(snapshot, "getBlockedAccounts");
             ret.Should().BeOfType<VM.Types.Array>();
             ((VM.Types.Array)ret).Count.Should().Be(1);
-            ((VM.Types.Array)ret)[0].GetByteArray().Should().BeEquivalentTo(UInt160.Zero.ToArray());
+            ((VM.Types.Array)ret)[0].GetByteArray().ToArray().Should().BeEquivalentTo(UInt160.Zero.ToArray());
 
             // Unblock without signature
 
@@ -214,7 +214,7 @@ public void Check_Block_UnblockAccount()
             ret = NativeContract.Policy.Call(snapshot, "getBlockedAccounts");
             ret.Should().BeOfType<VM.Types.Array>();
             ((VM.Types.Array)ret).Count.Should().Be(1);
-            ((VM.Types.Array)ret)[0].GetByteArray().Should().BeEquivalentTo(UInt160.Zero.ToArray());
+            ((VM.Types.Array)ret)[0].GetByteArray().ToArray().Should().BeEquivalentTo(UInt160.Zero.ToArray());
 
             // Unblock with signature
 

neo.UnitTests/SmartContract/UT_InteropService.NEO.cs

@@ -266,7 +266,7 @@ public void TestStorage_Find()
             var iterator = ((InteropInterface<StorageIterator>)engine.CurrentContext.EvaluationStack.Pop()).GetInterface<StorageIterator>();
             iterator.Next();
             var ele = iterator.Value();
-            ele.GetByteArray().ToHexString().Should().Be(storageItem.Value.ToHexString());
+            ele.GetByteArray().Span.ToHexString().Should().Be(storageItem.Value.ToHexString());
 
             engine.CurrentContext.EvaluationStack.Push(1);
             InteropService.Invoke(engine, InteropService.Neo_Storage_Find).Should().BeFalse();
@@ -284,7 +284,7 @@ public void TestEnumerator_Create()
             InteropService.Invoke(engine, InteropService.Neo_Enumerator_Create).Should().BeTrue();
             var ret = (InteropInterface<IEnumerator>)engine.CurrentContext.EvaluationStack.Pop();
             ret.GetInterface<IEnumerator>().Next();
-            ret.GetInterface<IEnumerator>().Value().GetByteArray().ToHexString()
+            ret.GetInterface<IEnumerator>().Value().GetByteArray().Span.ToHexString()
                 .Should().Be(new byte[] { 0x01 }.ToHexString());
 
             engine.CurrentContext.EvaluationStack.Push(1);
@@ -319,7 +319,7 @@ public void TestEnumerator_Value()
             wrapper.Next();
             engine.CurrentContext.EvaluationStack.Push(new InteropInterface<ArrayWrapper>(wrapper));
             InteropService.Invoke(engine, InteropService.Neo_Enumerator_Value).Should().BeTrue();
-            engine.CurrentContext.EvaluationStack.Pop().GetByteArray().ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
+            engine.CurrentContext.EvaluationStack.Pop().GetByteArray().Span.ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
 
             engine.CurrentContext.EvaluationStack.Push(1);
             InteropService.Invoke(engine, InteropService.Neo_Enumerator_Value).Should().BeFalse();
@@ -344,7 +344,7 @@ public void TestEnumerator_Concat()
             InteropService.Invoke(engine, InteropService.Neo_Enumerator_Concat).Should().BeTrue();
             var ret = ((InteropInterface<IEnumerator>)engine.CurrentContext.EvaluationStack.Pop()).GetInterface<IEnumerator>();
             ret.Next().Should().BeTrue();
-            ret.Value().GetByteArray().ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
+            ret.Value().GetByteArray().Span.ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
         }
 
         [TestMethod]
@@ -359,7 +359,7 @@ public void TestIterator_Create()
             InteropService.Invoke(engine, InteropService.Neo_Iterator_Create).Should().BeTrue();
             var ret = (InteropInterface<IIterator>)engine.CurrentContext.EvaluationStack.Pop();
             ret.GetInterface<IIterator>().Next();
-            ret.GetInterface<IIterator>().Value().GetByteArray().ToHexString()
+            ret.GetInterface<IIterator>().Value().GetByteArray().Span.ToHexString()
                 .Should().Be(new byte[] { 0x01 }.ToHexString());
 
             var map = new Map
@@ -428,7 +428,7 @@ public void TestIterator_Values()
             InteropService.Invoke(engine, InteropService.Neo_Iterator_Values).Should().BeTrue();
             var ret = ((InteropInterface<IteratorValuesWrapper>)engine.CurrentContext.EvaluationStack.Pop()).GetInterface<IteratorValuesWrapper>();
             ret.Next();
-            ret.Value().GetByteArray().ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
+            ret.Value().GetByteArray().Span.ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
 
             engine.CurrentContext.EvaluationStack.Push(1);
             InteropService.Invoke(engine, InteropService.Neo_Iterator_Values).Should().BeFalse();
@@ -453,7 +453,7 @@ public void TestIterator_Concat()
             InteropService.Invoke(engine, InteropService.Neo_Iterator_Concat).Should().BeTrue();
             var ret = ((InteropInterface<IIterator>)engine.CurrentContext.EvaluationStack.Pop()).GetInterface<IIterator>();
             ret.Next().Should().BeTrue();
-            ret.Value().GetByteArray().ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
+            ret.Value().GetByteArray().Span.ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
         }
 
         [TestMethod]