Remove exception from GetInvocationCounter (#1948)

* Remove exception from GetInvocationCounter * Ensure invocationCounter * Optimize Co-authored-by: erikzhang <[email protected]>
neo-project · Sep 23, 2020 · 7d77cab · 7d77cab
1 parent a7ea1fa
commit 7d77cab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/neo/SmartContract/ApplicationEngine.Runtime.cs b/src/neo/SmartContract/ApplicationEngine.Runtime.cs
@@ -161,7 +161,9 @@ protected internal bool CheckWitnessInternal(UInt160 hash)
         protected internal int GetInvocationCounter()
         {
             if (!invocationCounter.TryGetValue(CurrentScriptHash, out var counter))
-                throw new InvalidOperationException();
+            {
+                invocationCounter[CurrentScriptHash] = counter = 1;
+            }
             return counter;
         }
 

diff --git a/src/neo/SmartContract/ApplicationEngine.cs b/src/neo/SmartContract/ApplicationEngine.cs
@@ -154,7 +154,10 @@ protected override void LoadContext(ExecutionContext context)
         {
             // Set default execution context state
 
-            context.GetState<ExecutionContextState>().ScriptHash ??= ((byte[])context.Script).ToScriptHash();
+            var state = context.GetState<ExecutionContextState>();
+            state.ScriptHash ??= ((byte[])context.Script).ToScriptHash();
+            invocationCounter.TryAdd(state.ScriptHash, 1);
+
             base.LoadContext(context);
         }
 

diff --git a/tests/neo.UnitTests/SmartContract/UT_InteropService.cs b/tests/neo.UnitTests/SmartContract/UT_InteropService.cs
@@ -311,7 +311,7 @@ public void TestRuntime_Deserialize()
         public void TestRuntime_GetInvocationCounter()
         {
             var engine = GetEngine();
-            Assert.ThrowsException<InvalidOperationException>(() => engine.GetInvocationCounter());
+            Assert.AreEqual(1, engine.GetInvocationCounter());
         }
 
         [TestMethod]