Remove iterator wrappers (#2439)

neo-project · Apr 18, 2021 · eed9087 · eed9087
1 parent 116bc24
commit eed9087
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 320 deletions.
diff --git a/src/neo/SmartContract/ApplicationEngine.Iterator.cs b/src/neo/SmartContract/ApplicationEngine.Iterator.cs
@@ -1,18 +1,10 @@
 using Neo.SmartContract.Iterators;
 using Neo.VM.Types;
-using System;
-using Array = Neo.VM.Types.Array;
 
 namespace Neo.SmartContract
 {
     partial class ApplicationEngine
     {
-        /// <summary>
-        /// The <see cref="InteropDescriptor"/> of System.Iterator.Create.
-        /// Creates an <see cref="IIterator"/> with the specified <see cref="StackItem"/>.
-        /// </summary>
-        public static readonly InteropDescriptor System_Iterator_Create = Register("System.Iterator.Create", nameof(CreateIterator), 1 << 4, CallFlags.None);
-
         /// <summary>
         /// The <see cref="InteropDescriptor"/> of System.Iterator.Next.
         /// Advances the iterator to the next element of the collection.
@@ -25,24 +17,6 @@ partial class ApplicationEngine
         /// </summary>
         public static readonly InteropDescriptor System_Iterator_Value = Register("System.Iterator.Value", nameof(IteratorValue), 1 << 4, CallFlags.None);
 
-        /// <summary>
-        /// The implementation of System.Iterator.Create.
-        /// Creates an <see cref="IIterator"/> with the specified <see cref="StackItem"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="StackItem"/> wrapped by the iterator.</param>
-        /// <returns>The created iterator.</returns>
-        protected internal IIterator CreateIterator(StackItem item)
-        {
-            return item switch
-            {
-                Array array => new ArrayWrapper(array),
-                Map map => new MapWrapper(map, ReferenceCounter),
-                VM.Types.Buffer buffer => new ByteArrayWrapper(buffer),
-                PrimitiveType primitive => new ByteArrayWrapper(primitive),
-                _ => throw new ArgumentException(null, nameof(item))
-            };
-        }
-
         /// <summary>
         /// The implementation of System.Iterator.Next.
         /// Advances the iterator to the next element of the collection.

diff --git a/src/neo/SmartContract/Iterators/ArrayWrapper.cs b/src/neo/SmartContract/Iterators/ArrayWrapper.cs
diff --git a/src/neo/SmartContract/Iterators/ByteArrayWrapper.cs b/src/neo/SmartContract/Iterators/ByteArrayWrapper.cs
diff --git a/src/neo/SmartContract/Iterators/MapWrapper.cs b/src/neo/SmartContract/Iterators/MapWrapper.cs
diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_ArrayWrapper.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_ArrayWrapper.cs
diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_MapWrapper.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_MapWrapper.cs
diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs
diff --git a/tests/neo.UnitTests/SmartContract/UT_InteropService.NEO.cs b/tests/neo.UnitTests/SmartContract/UT_InteropService.NEO.cs
@@ -6,16 +6,13 @@
 using Neo.Network.P2P;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;
-using Neo.SmartContract.Iterators;
 using Neo.SmartContract.Manifest;
 using Neo.SmartContract.Native;
 using Neo.UnitTests.Extensions;
 using Neo.VM;
-using Neo.VM.Types;
 using Neo.Wallets;
 using System;
 using System.Linq;
-using VMArray = Neo.VM.Types.Array;
 
 namespace Neo.UnitTests.SmartContract
 {
@@ -256,54 +253,5 @@ public void TestStorage_Find()
             var ele = iterator.Value();
             ele.GetSpan().ToHexString().Should().Be(storageItem.Value.ToHexString());
         }
-
-        [TestMethod]
-        public void TestIterator_Next()
-        {
-            var arr = new VMArray {
-                new byte[]{ 0x01 },
-                new byte[]{ 0x02 }
-            };
-            ApplicationEngine.IteratorNext(new ArrayWrapper(arr)).Should().BeTrue();
-        }
-
-        [TestMethod]
-        public void TestIterator_Value()
-        {
-            var arr = new VMArray {
-                new byte[]{ 0x01 },
-                new byte[]{ 0x02 }
-            };
-            var wrapper = new ArrayWrapper(arr);
-            wrapper.Next();
-            ApplicationEngine.IteratorValue(wrapper).GetSpan().ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
-        }
-
-        [TestMethod]
-        public void TestIterator_Create()
-        {
-            var engine = GetEngine();
-            var arr = new VMArray {
-                new byte[]{ 0x01 },
-                new byte[]{ 0x02 }
-            };
-            var ret = engine.CreateIterator(arr);
-            ret.Next();
-            ret.Value().GetSpan().ToHexString().Should().Be(new byte[] { 0x01 }.ToHexString());
-
-            var interop = new InteropInterface(1);
-            Assert.ThrowsException<ArgumentException>(() => engine.CreateIterator(interop));
-
-            var map = new Map
-            {
-                [1] = 2,
-                [3] = 4
-            };
-            ret = engine.CreateIterator(map);
-            ret.Next();
-            Struct @struct = (Struct)ret.Value();
-            @struct[0].GetInteger().Should().Be(1);
-            @struct[1].GetInteger().Should().Be(2);
-        }
     }
 }