Remove Wanring (#3283)

Author: cschuchardt88

src/Neo.GUI/Neo.GUI.csproj

@@ -10,6 +10,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <Product>Neo.GUI</Product>
     <ApplicationIcon>neo.ico</ApplicationIcon>
+    <GenerateResourceWarnOnBinaryFormatterUse>false</GenerateResourceWarnOnBinaryFormatterUse>
   </PropertyGroup>
 
   <ItemGroup>

src/Neo/SmartContract/ApplicationEngine.cs

@@ -253,7 +253,9 @@ protected static void OnSysCall(ExecutionEngine engine, Instruction instruction)
         /// <param name="datoshi">The amount of GAS, in the unit of datoshi, 1 datoshi = 1e-8 GAS, to be added.</param>
         protected internal void AddFee(long datoshi)
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             FeeConsumed = GasConsumed = checked(FeeConsumed + datoshi);
+#pragma warning restore CS0618 // Type or member is obsolete
             if (FeeConsumed > _feeAmount)
                 throw new InvalidOperationException("Insufficient GAS.");
         }

src/Plugins/OracleService/OracleService.cs

@@ -430,7 +430,7 @@ public static Transaction CreateResponseTx(DataCache snapshot, OracleRequest req
             ContractMethodDescriptor md = oracleContract.Manifest.Abi.GetMethod("verify", -1);
             engine.LoadContract(oracleContract, md, CallFlags.None);
             if (engine.Execute() != VMState.HALT) return null;
-            tx.NetworkFee += engine.GasConsumed;
+            tx.NetworkFee += engine.FeeConsumed;
 
             var executionFactor = NativeContract.Policy.GetExecFeeFactor(snapshot);
             var networkFee = executionFactor * SmartContract.Helper.MultiSignatureContractCost(m, n);

src/Plugins/RpcServer/RpcServer.SmartContract.cs

@@ -76,7 +76,7 @@ private JObject GetInvokeResult(byte[] script, Signer[] signers = null, Witness[
                 json["script"] = Convert.ToBase64String(script);
                 json["state"] = session.Engine.State;
                 // Gas consumed in the unit of datoshi, 1 GAS = 10^8 datoshi
-                json["gasconsumed"] = session.Engine.GasConsumed.ToString();
+                json["gasconsumed"] = session.Engine.FeeConsumed.ToString();
                 json["exception"] = GetExceptionMessage(session.Engine.FaultException);
                 json["notifications"] = new JArray(session.Engine.Notifications.Select(n =>
                 {

src/Plugins/RpcServer/RpcServer.Wallet.cs

@@ -383,7 +383,7 @@ private JObject GetVerificationResult(UInt160 scriptHash, ContractParameter[] ar
             json["script"] = Convert.ToBase64String(invocationScript);
             json["state"] = engine.Execute();
             // Gas consumed in the unit of datoshi, 1 GAS = 1e8 datoshi
-            json["gasconsumed"] = engine.GasConsumed.ToString();
+            json["gasconsumed"] = engine.FeeConsumed.ToString();
             json["exception"] = GetExceptionMessage(engine.FaultException);
             try
             {

src/Plugins/StorageDumper/Settings.cs

@@ -34,12 +34,12 @@ internal class Settings
 
         private Settings(IConfigurationSection section)
         {
-            /// Geting settings for storage changes state dumper
+            // Geting settings for storage changes state dumper
             BlockCacheSize = section.GetValue("BlockCacheSize", 1000u);
             HeightToBegin = section.GetValue("HeightToBegin", 0u);
             StoragePerFolder = section.GetValue("StoragePerFolder", 100000u);
             Exclude = section.GetSection("Exclude").Exists()
-                ? section.GetSection("Exclude").GetChildren().Select(p => int.Parse(p.Value)).ToArray()
+                ? section.GetSection("Exclude").GetChildren().Select(p => int.Parse(p.Value!)).ToArray()
                 : new[] { NativeContract.Ledger.Id };
         }
 

src/Plugins/StorageDumper/StorageDumper.cs

@@ -23,12 +23,12 @@ public class StorageDumper : Plugin
     {
         private readonly Dictionary<uint, NeoSystem> systems = new Dictionary<uint, NeoSystem>();
 
-        private StreamWriter _writer;
+        private StreamWriter? _writer;
         /// <summary>
         /// _currentBlock stores the last cached item
         /// </summary>
-        private JObject _currentBlock;
-        private string _lastCreateDirectory;
+        private JObject? _currentBlock;
+        private string? _lastCreateDirectory;
 
 
         public override string Description => "Exports Neo-CLI status data";
@@ -73,7 +73,7 @@ private void OnDumpStorage(uint network, UInt160? contractHash = null)
                 prefix = BitConverter.GetBytes(contract.Id);
             }
             var states = systems[network].StoreView.Find(prefix);
-            JArray array = new JArray(states.Where(p => !Settings.Default.Exclude.Contains(p.Key.Id)).Select(p => new JObject
+            JArray array = new JArray(states.Where(p => !Settings.Default!.Exclude.Contains(p.Key.Id)).Select(p => new JObject
             {
                 ["key"] = Convert.ToBase64String(p.Key.ToArray()),
                 ["value"] = Convert.ToBase64String(p.Value.ToArray())
@@ -94,7 +94,7 @@ private void OnCommitting(NeoSystem system, Block block, DataCache snapshot, IRe
         private void OnPersistStorage(uint network, DataCache snapshot)
         {
             uint blockIndex = NativeContract.Ledger.CurrentIndex(snapshot);
-            if (blockIndex >= Settings.Default.HeightToBegin)
+            if (blockIndex >= Settings.Default!.HeightToBegin)
             {
                 JArray stateChangeArray = new JArray();
 
@@ -139,7 +139,7 @@ private void OnCommitted(NeoSystem system, Block block)
 
         void OnCommitStorage(uint network, DataCache snapshot)
         {
-            if (_currentBlock != null)
+            if (_currentBlock != null && _writer != null)
             {
                 _writer.WriteLine(_currentBlock.ToString());
                 _writer.Flush();
@@ -150,10 +150,10 @@ private void InitFileWriter(uint network, DataCache snapshot)
         {
             uint blockIndex = NativeContract.Ledger.CurrentIndex(snapshot);
             if (_writer == null
-                || blockIndex % Settings.Default.BlockCacheSize == 0)
+                || blockIndex % Settings.Default!.BlockCacheSize == 0)
             {
                 string path = GetOrCreateDirectory(network, blockIndex);
-                var filepart = (blockIndex / Settings.Default.BlockCacheSize) * Settings.Default.BlockCacheSize;
+                var filepart = (blockIndex / Settings.Default!.BlockCacheSize) * Settings.Default.BlockCacheSize;
                 path = $"{path}/dump-block-{filepart}.dump";
                 if (_writer != null)
                 {
@@ -176,7 +176,7 @@ private string GetOrCreateDirectory(uint network, uint blockIndex)
 
         private string GetDirectoryPath(uint network, uint blockIndex)
         {
-            uint folder = (blockIndex / Settings.Default.StoragePerFolder) * Settings.Default.StoragePerFolder;
+            uint folder = (blockIndex / Settings.Default!.StoragePerFolder) * Settings.Default.StoragePerFolder;
             return $"./StorageDumper_{network}/BlockStorage_{folder}";
         }