集成测试模块

nuls-io · Mar 23, 2019 · 89db187 · 89db187
1 parent a1d2bf3
commit 89db187
Show file tree

Hide file tree

Showing 60 changed files with 705 additions and 255 deletions.
diff --git a/account/nuls-account/src/main/java/io/nuls/account/util/LoggerUtil.java b/account/nuls-account/src/main/java/io/nuls/account/util/LoggerUtil.java
@@ -25,14 +25,22 @@
 package io.nuls.account.util;
 
 import ch.qos.logback.classic.Level;
+import io.nuls.tools.basic.InitializingBean;
+import io.nuls.tools.core.annotation.Component;
+import io.nuls.tools.core.annotation.Configuration;
+import io.nuls.tools.core.annotation.Value;
+import io.nuls.tools.exception.NulsException;
 import io.nuls.tools.log.logback.LoggerBuilder;
 import io.nuls.tools.log.logback.NulsLogger;
+import io.nuls.tools.model.StringUtils;
 
 /**
  * @author qinyifeng
  * @description
  * @date 2019/03/07
  **/
 public class LoggerUtil {
-   public static NulsLogger logger = LoggerBuilder.getLogger("./account", "ac",Level.ALL);
+
+   public static NulsLogger logger = LoggerBuilder.getLogger("account", "log",Level.ALL);;
+
 }
diff --git a/account/nuls-account/src/main/resources/module.json b/account/nuls-account/src/main/resources/module.json
@@ -1,4 +1,5 @@
 {
+  "APP_NAME": "account",
   "chainConfig": {
     "chainId": 2,
     "assetsId": 1

diff --git a/build/default-config.json b/build/default-config.json
@@ -0,0 +1,3 @@
+{
+  "logPath": "../../../../logs"
+}
diff --git a/build/merge-ncf.sh b/build/merge-ncf.sh
@@ -49,7 +49,7 @@ do
 		titleList[${#titleList[@]}]="$TEMP"
 	fi
 done
-#echo ${titleList[@]}  # Section list
+echo ${titleList[@]}  # Section list
 for title in ${titleList[@]}
 do
 	#echo $title

diff --git a/build/module-prod.ncf b/build/module-prod.ncf
@@ -1,3 +1,5 @@
+[JAVA]
+
 [Core]
 Language=JAVA
 Managed=1

diff --git a/build/start-mykernel.sh b/build/start-mykernel.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 #cd ./mykernel/1.0.0
+BIN_PATH=$(cd $(dirname $0); pwd);
+cd $BIN_PATH;
 function get_fullpath()
 {
    _PWD=`pwd`
@@ -20,19 +22,59 @@ do
             case $name in
             b)     RUNBLOCK="1";;
             j)     JAVA_HOME="$OPTARG";;
-            c)     CONFIG="`get_fullpath $OPTARG`/${OPTARG##*/}";;
+            c)     
+                    CONFIG="`get_fullpath $OPTARG`/${OPTARG##*/}"
+                    if [ "${CONFIG##*.}"x != "properties"x ]; then
+                        echo "-c setting config file must be *.ncf"
+                        exit 1;
+                    fi
+                    ;;
             ?)     exit 2;;
            esac
 done
-echo $CONFIG
+if [ ! -f "$CONFIG" ]; then
+    CONFIG="${BIN_PATH}/default-config.json"
+fi
+#
+#if [ -f "$CONFIG" ]; then
+#    if [ -f "./config.temp.properties" ]; then
+#        rm ./config.temp.properties
+#    fi
+#    touch ./config.temp.properties
+#    while read line
+#	do
+#	    pname=$(echo $line | awk -F '=' '{print $1}')
+#        pvalue=$(awk -v a="$line" '
+#                            BEGIN{
+#                                len = split(a,ary,"=")
+#                                r=""
+#                                for ( i = 2; i <= len; i++ ){
+#                                    if(r != ""){
+#                                        r = (r"=")
+#                                    }
+#                                    r=(r""ary[i])
+#                                }
+#                                print r
+#                            }
+#                        ')
+#        if [ -d "$pvalue" ]; then
+#            pvalue=$(`dirname $pvalue`)
+#        fi
+#        if [ -f "$pvalue" ]; then
+#            pvalue="`get_fullpath $pvalue`/${pvalue##*/}"
+#        fi
+#		echo "${pname}=${pvalue}" >> ./config.temp.properties
+#	done < $CONFIG
+#fi
+#exit 0
 JAVA="$JAVA_HOME/bin/java"
 if [[ ! -r "$JAVA" ]]; then
     JAVA='java'
 fi
 
 JAVA_EXIST=`${JAVA} -version 2>&1 |grep 11`
 if [ ! -n "$JAVA_EXIST" ]; then
-    log "JDK version is not 11"
+    echo "JDK version is not 11"
     ${JAVA} -version
     exit 0;
 fi
@@ -42,9 +84,9 @@ cd ../Modules/Nuls
 MODULE_PATH=$(pwd)
 if [ -z "${RUNBLOCK}" ];
 then
-    ${JAVA} -server -classpath ./libs/*:./mykernel/1.0.0/mykernel-1.0.0.jar io.nuls.mykernel.MyKernelBootstrap startModule $MODULE_PATH $CONFIG
+    ${JAVA} -server -Dapp.name=mykernel  -classpath ./libs/*:./mykernel/1.0.0/mykernel-1.0.0.jar io.nuls.mykernel.MyKernelBootstrap startModule $MODULE_PATH $CONFIG
 else
-    nohup ${JAVA} -server -classpath ./libs/*:./mykernel/1.0.0/mykernel-1.0.0.jar io.nuls.mykernel.MyKernelBootstrap startModule $MODULE_PATH $CONFIG > mykernel.log 2>&1 &
+    nohup ${JAVA} -server -Dapp.name=mykernel  -classpath ./libs/*:./mykernel/1.0.0/mykernel-1.0.0.jar io.nuls.mykernel.MyKernelBootstrap startModule $MODULE_PATH $CONFIG > mykernel.log 2>&1 &
 fi
 
 
diff --git a/build/start-temp.sh b/build/start-temp.sh
@@ -102,7 +102,7 @@ JAVA_OPTS=" -server -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -Xms${JOPT_XMS}m -Xmx${
 JAVA_OOM_DUMP="-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOGS_DIR}/oom-${START_DATE}.hprof"
 JAVA_OPTS="$JAVA_OPTS $JAVA_GC_LOG $JAVA_OOM_DUMP  -Dsys.name=$APP_NAME -Dactive.module=${config} "
 # echo "${JAVA} ${JAVA_OPTS} ${CLASSPATH} ${MAIN_CLASS} ${NulstarUrl}"
-nohup ${JAVA} ${JAVA_OPTS} ${CLASSPATH} ${MAIN_CLASS} ${NulstarUrl} > ${STDOUT_FILE} 2>&1 &
+nohup ${JAVA} ${JAVA_OPTS} ${CLASSPATH} ${MAIN_CLASS} ${NulstarUrl} 2>&1 &
 
 log "${APP_NAME} IS STARTING \n ${APP_NAME} START CMD: ${JAVA} ${JAVA_OPTS} ${CLASSPATH} ${MAIN_CLASS} ${NulstarUrl}  \n ${APP_NAME} 日志文件: ${STDOUT_FILE}"
 # echo "${APP_NAME} start cmd:" $'\e[0;31m'${JAVA} ${JAVA_OPTS} ${CLASSPATH} ${MAIN_CLASS} ${NulstarUrl}$'\e[0m'

diff --git a/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CmdClientModule.java b/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CmdClientModule.java
@@ -1,34 +1,24 @@
 package io.nuls.cmd.client;
 
 import io.nuls.api.provider.Provider;
-import io.nuls.api.provider.ServiceManager;
-import io.nuls.api.provider.account.AccountService;
+import io.nuls.cmd.client.utils.LoggerUtil;
 import io.nuls.rpc.model.ModuleE;
 import io.nuls.rpc.modulebootstrap.Module;
 import io.nuls.rpc.modulebootstrap.RpcModule;
 import io.nuls.rpc.modulebootstrap.RpcModuleState;
 import io.nuls.tools.core.annotation.Autowired;
 import io.nuls.tools.core.annotation.Component;
 import io.nuls.tools.core.annotation.Value;
-import io.nuls.tools.exception.NulsException;
-import io.nuls.tools.model.StringUtils;
+import io.nuls.tools.log.logback.NulsLogger;
 import io.nuls.tools.parse.I18nUtils;
 import io.nuls.tools.thread.ThreadUtils;
-import jline.console.ConsoleReader;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Before;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
 
 /**
  * @Author: zhoulijun
  * @Time: 2019-03-05 15:18
  * @Description: 功能描述
  */
 @Component
-@Slf4j
 public class CmdClientModule extends RpcModule {
 
     @Autowired Config config;
@@ -45,6 +35,8 @@ public class CmdClientModule extends RpcModule {
 
     @Autowired CommandHandler commandHandler;
 
+    static NulsLogger log = LoggerUtil.logger;
+
     @Override
     public Module[] getDependencies() {
         return new Module[]{

diff --git a/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandHandler.java b/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandHandler.java
@@ -34,6 +34,7 @@
 import io.nuls.cmd.client.processor.consensus.DepositProcessor;
 import io.nuls.cmd.client.processor.consensus.StopAgentProcessor;
 import io.nuls.cmd.client.processor.consensus.WithdrawProcessor;
+import io.nuls.cmd.client.processor.contract.CreateContractProcessor;
 import io.nuls.cmd.client.processor.ledger.GetBalanceProcessor;
 import io.nuls.cmd.client.processor.network.GetNetworkProcessor;
 import io.nuls.cmd.client.processor.system.ExitProcessor;
@@ -143,6 +144,9 @@ public void afterPropertiesSet() throws NulsException {
         register(SpringLiteContext.getBean(HelpProcessor.class));
 
         register(getBean(GetNetworkProcessor.class));
+
+
+        register(getBean(CreateContractProcessor.class));
     }
 
     public void start() {

diff --git a/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandResult.java b/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/CommandResult.java
@@ -30,23 +30,25 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.nuls.api.provider.Result;
 import io.nuls.cmd.client.processor.ErrorCodeConstants;
+import io.nuls.cmd.client.utils.LoggerUtil;
 import io.nuls.tools.constant.ErrorCode;
+import io.nuls.tools.log.logback.NulsLogger;
 import io.nuls.tools.model.StringUtils;
 import io.nuls.tools.parse.JSONUtils;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
 
 /**
  * @author Niels
  */
-@Slf4j
 public class CommandResult {
 
     public boolean success;
 
     private String message;
 
+    static NulsLogger log = LoggerUtil.logger;
+
     public boolean isSuccess() {
         return success;
     }
@@ -75,7 +77,7 @@ public String toString() {
     }
 
     public static CommandResult failed(String errCode){
-        return getFailed(ErrorCode.init(ErrorCodeConstants.SYSTEM_ERR).getMsg());
+        return getFailed(ErrorCodeConstants.SYSTEM_ERR.getMsg());
     }
 
     public static CommandResult getFailed(String message) {

diff --git a/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/CommandGroup.java b/cmd-client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/CommandGroup.java
@@ -17,6 +17,7 @@ public enum CommandGroup {
     Ledger,
     Transaction,
     Block,
+    Smart_Contract,
     System;
 
     final String title;

diff --git a/...client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/ErrorCodeConstants.java b/...client/nuls-cmd-client/src/main/java/io/nuls/cmd/client/processor/ErrorCodeConstants.java
@@ -9,7 +9,7 @@
  */
 public final class ErrorCodeConstants {
 
-    public static final String  SYSTEM_ERR = "10001";
+    public static final ErrorCode  SYSTEM_ERR = ErrorCode.init("10001");
 
     /**
      * 参数错误

diff --git a/...s-cmd-client/src/main/java/io/nuls/cmd/client/processor/account/GetAccountsProcessor.java b/...s-cmd-client/src/main/java/io/nuls/cmd/client/processor/account/GetAccountsProcessor.java
@@ -76,7 +76,7 @@ public CommandResult execute(String[] args) {
         try {
             return CommandResult.getSuccess(JSONUtils.obj2PrettyJson(result.getList()));
         } catch (JsonProcessingException e) {
-            return CommandResult.failed(ErrorCodeConstants.SYSTEM_ERR);
+            return CommandResult.failed(ErrorCodeConstants.SYSTEM_ERR.getMsg());
         }
     }
 }
diff --git a/...-client/src/main/java/io/nuls/cmd/client/processor/account/ImportByKeyStoreProcessor.java b/...-client/src/main/java/io/nuls/cmd/client/processor/account/ImportByKeyStoreProcessor.java
@@ -25,29 +25,26 @@
 
 package io.nuls.cmd.client.processor.account;
 
-import io.nuls.api.provider.ServiceManager;
-import io.nuls.api.provider.account.AccountService;
 import io.nuls.api.provider.account.facade.ImportAccountByKeyStoreReq;
 import io.nuls.cmd.client.CommandBuilder;
 import io.nuls.cmd.client.CommandHelper;
 import io.nuls.cmd.client.CommandResult;
 import io.nuls.cmd.client.processor.CommandProcessor;
+import io.nuls.cmd.client.utils.LoggerUtil;
 import io.nuls.tools.core.annotation.Component;
 import io.nuls.tools.crypto.HexUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.*;
-import java.net.URLDecoder;
+import io.nuls.tools.log.logback.NulsLogger;
 
 /**
  * 根据keystore导出账户,
  * 密码用来验证(keystore), 如果keystore没有密码则可以不输
  * @author: Charlie
  */
-@Slf4j
 @Component
 public class ImportByKeyStoreProcessor extends AccountBaseProcessor implements CommandProcessor {
 
+    static NulsLogger log = LoggerUtil.logger;
+
     @Override
     public String getCommand() {
         return "importkeystore";

diff --git a/...-client/src/main/java/io/nuls/cmd/client/processor/block/GetBestBlockHeaderProcessor.java b/...-client/src/main/java/io/nuls/cmd/client/processor/block/GetBestBlockHeaderProcessor.java
@@ -31,19 +31,16 @@
 import io.nuls.api.provider.block.BlockService;
 import io.nuls.api.provider.block.facade.BlockHeaderData;
 import io.nuls.api.provider.block.facade.GetBlockHeaderByLastHeightReq;
-import io.nuls.base.data.BlockHeader;
 import io.nuls.cmd.client.CommandBuilder;
 import io.nuls.cmd.client.CommandResult;
-import io.nuls.cmd.client.processor.CommandProcessor;
 import io.nuls.cmd.client.processor.CommandGroup;
+import io.nuls.cmd.client.processor.CommandProcessor;
 import io.nuls.tools.core.annotation.Component;
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author: Charlie
  */
 @Component
-@Slf4j
 public class GetBestBlockHeaderProcessor implements CommandProcessor {
 
     BlockService blockService = ServiceManager.get(BlockService.class);

diff --git a/...-cmd-client/src/main/java/io/nuls/cmd/client/processor/block/GetBlockHeaderProcessor.java b/...-cmd-client/src/main/java/io/nuls/cmd/client/processor/block/GetBlockHeaderProcessor.java
@@ -31,14 +31,12 @@
 import io.nuls.api.provider.block.facade.BlockHeaderData;
 import io.nuls.api.provider.block.facade.GetBlockHeaderByHashReq;
 import io.nuls.api.provider.block.facade.GetBlockHeaderByHeightReq;
-import io.nuls.base.data.BlockHeader;
 import io.nuls.cmd.client.CommandBuilder;
 import io.nuls.cmd.client.CommandHelper;
 import io.nuls.cmd.client.CommandResult;
-import io.nuls.cmd.client.processor.CommandProcessor;
 import io.nuls.cmd.client.processor.CommandGroup;
+import io.nuls.cmd.client.processor.CommandProcessor;
 import io.nuls.tools.core.annotation.Component;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -48,7 +46,6 @@
  * @author: zhoulijun
  */
 @Component
-@Slf4j
 public class GetBlockHeaderProcessor implements CommandProcessor {
 
     Pattern IS_NUMBERIC = Pattern.compile("[0-9]+");

diff --git a/...cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/CreateAgentProcessor.java b/...cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/CreateAgentProcessor.java
@@ -26,20 +26,15 @@
 package io.nuls.cmd.client.processor.consensus;
 
 import io.nuls.api.provider.Result;
-import io.nuls.api.provider.ServiceManager;
-import io.nuls.api.provider.consensus.ConsensusProvider;
 import io.nuls.api.provider.consensus.facade.CreateAgentReq;
 import io.nuls.base.basic.AddressTool;
 import io.nuls.cmd.client.CommandBuilder;
 import io.nuls.cmd.client.CommandHelper;
 import io.nuls.cmd.client.CommandResult;
-import io.nuls.cmd.client.Config;
 import io.nuls.cmd.client.processor.CommandProcessor;
 import io.nuls.cmd.client.utils.Na;
-import io.nuls.tools.core.annotation.Autowired;
 import io.nuls.tools.core.annotation.Component;
 import io.nuls.tools.model.StringUtils;
-import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigInteger;
 
@@ -49,7 +44,6 @@
  * @author: zhoulijun
  */
 @Component
-@Slf4j
 public class CreateAgentProcessor extends ConsensusBaseProcessor implements CommandProcessor {
 
     @Override

diff --git a/...uls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/DepositProcessor.java b/...uls-cmd-client/src/main/java/io/nuls/cmd/client/processor/consensus/DepositProcessor.java
@@ -41,16 +41,15 @@
 import io.nuls.tools.core.annotation.Autowired;
 import io.nuls.tools.core.annotation.Component;
 import io.nuls.tools.model.StringUtils;
-import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigInteger;
-import static io.nuls.cmd.client.CommandHelper.*;
+
+import static io.nuls.cmd.client.CommandHelper.getPwd;
 
 /**
  * @author: zhoulijun
  */
 @Component
-@Slf4j
 public class DepositProcessor extends ConsensusBaseProcessor implements CommandProcessor {
 
     ConsensusProvider consensusProvider = ServiceManager.get(ConsensusProvider.class);