Merge pull request #2003 from rsksmart/bootstrap-fix

Fixed Bootstrap cli tool

Author: Vovchyk

rskj-core/src/main/java/co/rsk/cli/tools/StartBootstrap.java

@@ -58,46 +58,43 @@ public StartBootstrap(RskContext ctx) {
     public static void main(String[] args) {
         setUpThread(Thread.currentThread());
 
-        try (RskContext ctx = new BootstrapRskContext(args)) {
-            int result = new CommandLine(new StartBootstrap(ctx)).setUnmatchedArgumentsAllowed(true).execute(args);
+        RskContext ctx = null;
+        try {
+            ctx = new BootstrapRskContext(args);
+
+            new CommandLine(new StartBootstrap(ctx)).setUnmatchedArgumentsAllowed(true).execute(args);
+        } catch (Exception e) {
+            logger.error("Main thread of RSK bootstrap node crashed", e);
 
-            if (result != 0) {
-                throw new PicocliBadResultException(result);
+            if (ctx != null) {
+                ctx.close();
             }
+
+            System.exit(1);
         }
     }
 
     @Override
-    public Integer call() throws IOException {
+    public Integer call() throws Exception {
         PreflightChecksUtils preflightChecks = new PreflightChecksUtils(ctx);
         Runtime runtime = Runtime.getRuntime();
-        NodeStopper nodeStopper = System::exit;
 
-        runBootstrapNode(ctx, preflightChecks, runtime, nodeStopper);
+        runBootstrapNode(ctx, preflightChecks, runtime);
         return 0;
     }
 
     static void runBootstrapNode(@Nonnull RskContext ctx,
                                  @Nonnull PreflightChecksUtils preflightChecks,
-                                 @Nonnull Runtime runtime,
-                                 @Nonnull NodeStopper nodeStopper) {
-        try {
-            // make preflight checks
-            preflightChecks.runChecks();
+                                 @Nonnull Runtime runtime) throws Exception {
+        // make preflight checks
+        preflightChecks.runChecks();
 
-            // subscribe to shutdown hook
-            runtime.addShutdownHook(new Thread(ctx::close, "stopper"));
+        // subscribe to shutdown hook
+        runtime.addShutdownHook(new Thread(ctx::close, "stopper"));
 
-            // start node runner
-            NodeRunner runner = ctx.getNodeRunner();
-            runner.run();
-        } catch (Exception e) {
-            logger.error("Main thread of RSK bootstrap node crashed", e);
-
-            ctx.close();
-
-            nodeStopper.stop(1);
-        }
+        // start node runner
+        NodeRunner runner = ctx.getNodeRunner();
+        runner.run();
     }
 
     static void setUpThread(@Nonnull Thread thread) {

rskj-core/src/test/java/co/rsk/cli/tools/CliToolsTest.java

@@ -35,6 +35,7 @@
 import co.rsk.test.dsl.WorldDslProcessor;
 import co.rsk.trie.Trie;
 import co.rsk.util.NodeStopper;
+import co.rsk.util.PreflightCheckException;
 import co.rsk.util.PreflightChecksUtils;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -567,25 +568,22 @@ void startBootstrap() throws Exception {
         doReturn(runner).when(ctx).getNodeRunner();
         PreflightChecksUtils preflightChecks = mock(PreflightChecksUtils.class);
         Runtime runtime = mock(Runtime.class);
-        NodeStopper nodeStopper = mock(NodeStopper.class);
 
-        StartBootstrap.runBootstrapNode(ctx, preflightChecks, runtime, nodeStopper);
+        StartBootstrap.runBootstrapNode(ctx, preflightChecks, runtime);
 
         verify(preflightChecks, times(1)).runChecks();
         verify(runner, times(1)).run();
         verify(runtime, times(1)).addShutdownHook(threadCaptor.capture());
         assertEquals("stopper", threadCaptor.getValue().getName());
 
         // check unhappy flow of bootstrap node start
-        doThrow(new RuntimeException()).when(preflightChecks).runChecks();
+        doThrow(new PreflightCheckException("")).when(preflightChecks).runChecks();
 
-        StartBootstrap.runBootstrapNode(ctx, preflightChecks, runtime, nodeStopper);
+        Assertions.assertThrows(PreflightCheckException.class, () -> StartBootstrap.runBootstrapNode(ctx, preflightChecks, runtime));
 
         verify(preflightChecks, times(2)).runChecks();
         verify(runner, times(1)).run();
         verify(runtime, times(1)).addShutdownHook(any());
-        verify(ctx, times(1)).close();
-        verify(nodeStopper, times(1)).stop(1);
     }
 
     @Test