Merge pull request #35 from neo-project/emit-push-map-contract-parameter

Optimize
simplitech · Jan 8, 2021 · 6299795 · 6299795
2 parents 0c8f8e0 + a496157
commit 6299795
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/neo/VM/Helper.cs b/src/neo/VM/Helper.cs
@@ -25,7 +25,7 @@ public static ScriptBuilder CreateArray<T>(this ScriptBuilder sb, IReadOnlyList<
             return sb.Emit(OpCode.PACK);
         }
 
-        public static ScriptBuilder CreateMap<TKey, TValue>(this ScriptBuilder sb, IReadOnlyDictionary<TKey, TValue> map = null)
+        public static ScriptBuilder CreateMap<TKey, TValue>(this ScriptBuilder sb, IEnumerable<KeyValuePair<TKey, TValue>> map = null)
         {
             sb.Emit(OpCode.NEWMAP);
             if (map != null)
@@ -132,8 +132,7 @@ public static ScriptBuilder EmitPush(this ScriptBuilder sb, ContractParameter pa
                     case ContractParameterType.Map:
                         {
                             var pairs = (IList<KeyValuePair<ContractParameter, ContractParameter>>)parameter.Value;
-                            var map = new Dictionary<ContractParameter, ContractParameter>(pairs);
-                            sb.CreateMap(map);
+                            sb.CreateMap(pairs);
                         }
                         break;
                     default:

diff --git a/tests/neo.UnitTests/VM/UT_Helper.cs b/tests/neo.UnitTests/VM/UT_Helper.cs
@@ -250,10 +250,14 @@ public void TestEmitPush2()
             TestEmitPush2PublicKey();
             TestEmitPush2String();
             TestEmitPush2Array();
+            TestEmitPush2Map();
+        }
 
+        private void TestEmitPush2Map()
+        {
             ScriptBuilder sb = new ScriptBuilder();
-            Action action = () => sb.EmitPush(new ContractParameter(ContractParameterType.Map));
-            action.Should().Throw<ArgumentException>();
+            sb.EmitPush(new ContractParameter(ContractParameterType.Map));
+            CollectionAssert.AreEqual(new[] { (byte)OpCode.NEWMAP }, sb.ToArray());
         }
 
         private void TestEmitPush2Array()