Replace THROWIFNOT by ASSERT (#1475)

neo-project · Mar 22, 2020 · d71a470 · d71a470
1 parent a056f25
commit d71a470
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/neo/SmartContract/ApplicationEngine.OpCodePrices.cs b/src/neo/SmartContract/ApplicationEngine.OpCodePrices.cs
@@ -59,8 +59,8 @@ partial class ApplicationEngine
             [OpCode.CALL_L] = 22000,
             [OpCode.CALLA] = 22000,
             [OpCode.THROW] = 30,
-            [OpCode.THROWIF] = 30,
-            [OpCode.THROWIFNOT] = 30,
+            [OpCode.ABORT] = 30,
+            [OpCode.ASSERT] = 30,
             [OpCode.RET] = 0,
             [OpCode.SYSCALL] = 0,
             [OpCode.DEPTH] = 60,

diff --git a/src/neo/Wallets/Wallet.cs b/src/neo/Wallets/Wallet.cs
@@ -255,7 +255,7 @@ public Transaction MakeTransaction(TransferOutput[] outputs, UInt160 from = null
                             foreach (var (account, value) in balances_used)
                             {
                                 sb.EmitAppCall(output.AssetId, "transfer", account, output.ScriptHash, value);
-                                sb.Emit(OpCode.THROWIFNOT);
+                                sb.Emit(OpCode.ASSERT);
                             }
                         }
                         if (assetId.Equals(NativeContract.GAS.Hash))

diff --git a/src/neo/neo.csproj b/src/neo/neo.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.1" />
-    <PackageReference Include="Neo.VM" Version="3.0.0-CI00209" />
+    <PackageReference Include="Neo.VM" Version="3.0.0-CI00210" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs b/tests/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs
@@ -324,7 +324,7 @@ public void FeeIsSignatureContract_TestScope_Global()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }
 
@@ -417,7 +417,7 @@ public void FeeIsSignatureContract_TestScope_CurrentHash_GAS()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }
 
@@ -511,7 +511,7 @@ public void FeeIsSignatureContract_TestScope_CalledByEntry_Plus_GAS()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }
 
@@ -606,7 +606,7 @@ public void FeeIsSignatureContract_TestScope_CurrentHash_NEO_FAULT()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }
 
@@ -666,7 +666,7 @@ public void FeeIsSignatureContract_TestScope_CurrentHash_NEO_GAS()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }
 
@@ -763,7 +763,7 @@ public void FeeIsSignatureContract_TestScope_NoScopeFAULT()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }
 
@@ -1023,7 +1023,7 @@ public void FeeIsSignatureContract_TestScope_Global_Default()
                     // self-transfer of 1e-8 GAS
                     System.Numerics.BigInteger value = (new BigDecimal(1, 8)).Value;
                     sb.EmitAppCall(NativeContract.GAS.Hash, "transfer", acc.ScriptHash, acc.ScriptHash, value);
-                    sb.Emit(OpCode.THROWIFNOT);
+                    sb.Emit(OpCode.ASSERT);
                     script = sb.ToArray();
                 }