Allow to skip verification (#534)

* Allow to skip verification * Update neo-cli.csproj * Fix GUI
neo-project · Jan 21, 2020 · a477dc6 · a477dc6
1 parent 51cd29f
commit a477dc6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs
@@ -1370,9 +1370,14 @@ public void OpenWallet(string path, string password)
         public async void Start(string[] args)
         {
             if (NeoSystem != null) return;
+            bool verifyImport = true;
             for (int i = 0; i < args.Length; i++)
                 switch (args[i])
                 {
+                    case "/noverify":
+                    case "--noverify":
+                        verifyImport = false;
+                        break;
                     case "/testnet":
                     case "--testnet":
                     case "-t":
@@ -1398,7 +1403,11 @@ public async void Start(string[] args)
                         blocksToImport.Add(blocksBeingImported.Current);
                     }
                     if (blocksToImport.Count == 0) break;
-                    await NeoSystem.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import { Blocks = blocksToImport });
+                    await NeoSystem.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
+                    {
+                        Blocks = blocksToImport,
+                        Verify = verifyImport
+                    });
                     if (NeoSystem is null) return;
                 }
             }

diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00844" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00853" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
   </ItemGroup>
 

diff --git a/neo-gui/GUI/Wrappers/UIntBaseConverter.cs b/neo-gui/GUI/Wrappers/UIntBaseConverter.cs
@@ -31,9 +31,13 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
         {
             if (destinationType != typeof(string))
                 throw new NotSupportedException();
-            UIntBase i = value as UIntBase;
-            if (i == null) return null;
-            return i.ToString();
+
+            return value switch
+            {
+                UInt160 i => i.ToString(),
+                UInt256 i => i.ToString(),
+                _ => null,
+            };
         }
     }
 }