Merge pull request #637 from smart-coding/develop

optimise the main code and correct the test code

Author: olenheim

build.gradle

@@ -89,7 +89,7 @@ dependencies {
 
     compile group: 'com.beust', name: 'jcommander', version: '1.72'
 
-    compile group: 'junit', name: 'junit', version: '4.8.1'
+    compile group: 'junit', name: 'junit', version: '4.12'
 
     compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
 

src/main/java/org/tron/program/FullNode.java

@@ -22,12 +22,12 @@ public static void main(String[] args) throws InterruptedException {
     Args.setParam(args, Constant.TESTNET_CONF);
     Args cfgArgs = Args.getInstance();
 
-    ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
-
     if (cfgArgs.isHelp()) {
       logger.info("Here is the help message.");
       return;
     }
+    
+    ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
     Application appT = ApplicationFactory.create(context);
     shutdown(appT);
     //appT.init(cfgArgs);