Merge branch 'master' into fix-build

Jim8y · Jan 3, 2024 · d5cbfbd · d5cbfbd
2 parents 57dd0ae + 5c9699e
commit d5cbfbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Neo.VM/ExecutionEngine.cs b/src/Neo.VM/ExecutionEngine.cs
@@ -72,7 +72,7 @@ public VMState State
             {
                 return state;
             }
-            internal protected set
+            protected internal set
             {
                 if (state != value)
                 {
@@ -1459,7 +1459,7 @@ private void ExecuteLoadFromSlot(Slot? slot, int index)
         /// <summary>
         /// Execute the next instruction.
         /// </summary>
-        internal protected void ExecuteNext()
+        protected internal void ExecuteNext()
         {
             if (InvocationStack.Count == 0)
             {

diff --git a/src/Neo/SmartContract/ApplicationEngine.Storage.cs b/src/Neo/SmartContract/ApplicationEngine.Storage.cs
@@ -106,7 +106,7 @@ protected internal StorageContext GetReadOnlyContext()
         /// </summary>
         /// <param name="context">The storage context to convert.</param>
         /// <returns>The readonly storage context.</returns>
-        internal protected static StorageContext AsReadOnly(StorageContext context)
+        protected internal static StorageContext AsReadOnly(StorageContext context)
         {
             if (!context.IsReadOnly)
                 context = new StorageContext
@@ -167,8 +167,9 @@ protected internal IIterator Find(StorageContext context, byte[] prefix, FindOpt
         /// <param name="value">The value of the entry.</param>
         protected internal void Put(StorageContext context, byte[] key, byte[] value)
         {
-            if (key.Length > MaxStorageKeySize || value.Length > MaxStorageValueSize || context.IsReadOnly)
-                throw new ArgumentException();
+            if (key.Length > MaxStorageKeySize) throw new ArgumentException("Key length too big", nameof(key));
+            if (value.Length > MaxStorageValueSize) throw new ArgumentException("Value length too big", nameof(value));
+            if (context.IsReadOnly) throw new ArgumentException("StorageContext is readonly", nameof(context));
 
             int newDataSize;
             StorageKey skey = new()