Different Trigger for OnPersist and PostPersist (#2022)

* Split System Trigger * Fix UT * Update TriggerType.cs * Rename Co-authored-by: Erik Zhang <erik@neo.org>
neo-project · Oct 29, 2020 · 7a8bb73 · 7a8bb73
1 parent 7d3a4a2
commit 7a8bb73
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/src/neo/Ledger/Blockchain.cs b/src/neo/Ledger/Blockchain.cs
@@ -438,7 +438,7 @@ private void Persist(Block block)
                 snapshot.PersistingBlock = block;
                 if (block.Index > 0)
                 {
-                    using ApplicationEngine engine = ApplicationEngine.Create(TriggerType.System, null, snapshot);
+                    using ApplicationEngine engine = ApplicationEngine.Create(TriggerType.OnPersist, null, snapshot);
                     engine.LoadScript(onPersistScript);
                     if (engine.Execute() != VMState.HALT) throw new InvalidOperationException();
                     ApplicationExecuted application_executed = new ApplicationExecuted(engine);
@@ -477,7 +477,7 @@ private void Persist(Block block)
                     }
                 }
                 snapshot.BlockHashIndex.GetAndChange().Set(block);
-                using (ApplicationEngine engine = ApplicationEngine.Create(TriggerType.System, null, snapshot))
+                using (ApplicationEngine engine = ApplicationEngine.Create(TriggerType.PostPersist, null, snapshot))
                 {
                     engine.LoadScript(postPersistScript);
                     if (engine.Execute() != VMState.HALT) throw new InvalidOperationException();

diff --git a/src/neo/SmartContract/Native/NativeContract.cs b/src/neo/SmartContract/Native/NativeContract.cs
@@ -140,14 +140,14 @@ internal virtual void Initialize(ApplicationEngine engine)
         [ContractMethod(0, CallFlags.AllowModifyStates)]
         protected virtual void OnPersist(ApplicationEngine engine)
         {
-            if (engine.Trigger != TriggerType.System)
+            if (engine.Trigger != TriggerType.OnPersist)
                 throw new InvalidOperationException();
         }
 
         [ContractMethod(0, CallFlags.AllowModifyStates)]
         protected virtual void PostPersist(ApplicationEngine engine)
         {
-            if (engine.Trigger != TriggerType.System)
+            if (engine.Trigger != TriggerType.PostPersist)
                 throw new InvalidOperationException();
         }
 

diff --git a/src/neo/SmartContract/TriggerType.cs b/src/neo/SmartContract/TriggerType.cs
@@ -5,7 +5,8 @@ namespace Neo.SmartContract
     [Flags]
     public enum TriggerType : byte
     {
-        System = 0x01,
+        OnPersist = 0x01,
+        PostPersist = 0x02,
         /// <summary>
         /// The verification trigger indicates that the contract is being invoked as a verification function.
         /// The verification function can accept multiple parameters, and should return a boolean value that indicates the validity of the transaction or block.
@@ -23,6 +24,7 @@ public enum TriggerType : byte
         /// </summary>
         Application = 0x40,
 
-        All = System | Verification | Application
+        System = OnPersist | PostPersist,
+        All = OnPersist | PostPersist | Verification | Application
     }
 }
diff --git a/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs b/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
@@ -322,7 +322,7 @@ public void Check_GetCommittee()
                 sb.Emit(OpCode.DROP);
                 onPersistScript = sb.ToArray();
             }
-            ApplicationEngine engine = ApplicationEngine.Create(TriggerType.System, null, snapshot);
+            ApplicationEngine engine = ApplicationEngine.Create(TriggerType.OnPersist, null, snapshot);
             engine.LoadScript(onPersistScript);
             Assert.AreEqual(engine.Execute(), VMState.HALT);
 
@@ -410,7 +410,7 @@ public void Check_CommitteeBonus()
             {
                 sb.EmitAppCall(NativeContract.NEO.Hash, "postPersist");
                 sb.Emit(OpCode.RET);
-                ApplicationEngine engine = ApplicationEngine.Create(TriggerType.System, null, snapshot, (long)(20 * NativeContract.GAS.Factor));
+                ApplicationEngine engine = ApplicationEngine.Create(TriggerType.PostPersist, null, snapshot, (long)(20 * NativeContract.GAS.Factor));
                 engine.LoadScript(sb.ToArray());
                 engine.Execute();
                 engine.State.Should().Be(VM.VMState.HALT);

diff --git a/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs b/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
@@ -99,7 +99,7 @@ public void TestGetContract()
         public void TestInvoke()
         {
             var snapshot = Blockchain.Singleton.GetSnapshot();
-            ApplicationEngine engine = ApplicationEngine.Create(TriggerType.System, null, snapshot, 0);
+            ApplicationEngine engine = ApplicationEngine.Create(TriggerType.OnPersist, null, snapshot, 0);
             engine.LoadScript(testNativeContract.Script);
 
             ByteString method1 = new ByteString(System.Text.Encoding.Default.GetBytes("wrongMethod"));
@@ -123,7 +123,7 @@ public void TestOnPersistWithArgs()
             ApplicationEngine engine1 = ApplicationEngine.Create(TriggerType.Application, null, snapshot, 0);
             Assert.ThrowsException<InvalidOperationException>(() => testNativeContract.TestOnPersist(engine1));
 
-            ApplicationEngine engine2 = ApplicationEngine.Create(TriggerType.System, null, snapshot, 0);
+            ApplicationEngine engine2 = ApplicationEngine.Create(TriggerType.OnPersist, null, snapshot, 0);
             testNativeContract.TestOnPersist(engine2);
         }