Commit 39056dfa authored by QM's avatar QM

updata

parent 53821256
...@@ -6,7 +6,7 @@ DAPP_TEST_COMMON=dapp-test-common.sh ...@@ -6,7 +6,7 @@ DAPP_TEST_COMMON=dapp-test-common.sh
function dapp_test_rpc() { function dapp_test_rpc() {
local ip=$1 local ip=$1
local node3=$2 local dockerNamePrefix=$2
echo "============ # dapp rpc test begin =============" echo "============ # dapp rpc test begin ============="
if [ -d dapptest ]; then if [ -d dapptest ]; then
cp "$DAPP_TEST_COMMON" dapptest/ cp "$DAPP_TEST_COMMON" dapptest/
...@@ -18,7 +18,7 @@ function dapp_test_rpc() { ...@@ -18,7 +18,7 @@ function dapp_test_rpc() {
dapps=$(find . -maxdepth 1 -type d ! -name dapptest ! -name ticket ! -name . | sed 's/^\.\///' | sort) dapps=$(find . -maxdepth 1 -type d ! -name dapptest ! -name ticket ! -name . | sed 's/^\.\///' | sort)
echo "dapps list: $dapps" echo "dapps list: $dapps"
set +e set +e
parallel -k --jobs 40 --results outdir --joblog ./jobs.log ./{}/"${RPC_TESTFILE}" "$ip" "$node3" ::: "$dapps" parallel -k --jobs 40 --results outdir --joblog ./jobs.log ./{}/"${RPC_TESTFILE}" "$ip" "$dockerNamePrefix" ::: "$dapps"
local ret=$? local ret=$?
parallel -k --jobs 1 --results outdir --joblog ./jobsTicket.log ./{}/"${RPC_TESTFILE}" "$ip" ::: "ticket" parallel -k --jobs 1 --results outdir --joblog ./jobsTicket.log ./{}/"${RPC_TESTFILE}" "$ip" ::: "ticket"
local retTicket=$? local retTicket=$?
......
...@@ -461,6 +461,7 @@ function dapp_test_address() { ...@@ -461,6 +461,7 @@ function dapp_test_address() {
} }
function base_config() { function base_config() {
# sync
transfer "${CLI}" transfer "${CLI}"
} }
......
...@@ -19,12 +19,11 @@ import ( ...@@ -19,12 +19,11 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
var rootCmd = &cobra.Command{
Use: "chain33xEth-relayer" + "-cli",
Short: "chain33xEth-relayer" + "client tools",
}
var ( var (
rootCmd = &cobra.Command{
Use: "chain33xEth-relayer" + "-cli",
Short: "chain33xEth-relayer" + "client tools",
}
configPath = flag.String("f", "", "configfile") configPath = flag.String("f", "", "configfile")
) )
...@@ -66,7 +65,6 @@ func run(RPCAddr, NodeAddr string) { ...@@ -66,7 +65,6 @@ func run(RPCAddr, NodeAddr string) {
log.SetLogLevel("error") log.SetLogLevel("error")
rootCmd.PersistentFlags().String("rpc_laddr", RPCAddr, "http url") rootCmd.PersistentFlags().String("rpc_laddr", RPCAddr, "http url")
rootCmd.PersistentFlags().String("node_addr", NodeAddr, "eth node url") rootCmd.PersistentFlags().String("node_addr", NodeAddr, "eth node url")
//rootCmd.PersistentFlags().String("rpc_laddr", "", "http url")
if err := rootCmd.Execute(); err != nil { if err := rootCmd.Execute(); err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
...@@ -79,7 +77,6 @@ func initCfg(path string) *relayerTypes.RelayerConfig { ...@@ -79,7 +77,6 @@ func initCfg(path string) *relayerTypes.RelayerConfig {
fmt.Println(err) fmt.Println(err)
os.Exit(-1) os.Exit(-1)
} }
//fmt.Println(cfg)
return &cfg return &cfg
} }
...@@ -94,7 +91,6 @@ func main() { ...@@ -94,7 +91,6 @@ func main() {
buildflags.RPCAddr = "http://localhost:9901" buildflags.RPCAddr = "http://localhost:9901"
} }
if buildflags.NodeAddr == "" { if buildflags.NodeAddr == "" {
//buildflags.NodeAddr = "http://127.0.0.1:7545"
buildflags.NodeAddr = cfg.EthProviderCli buildflags.NodeAddr = cfg.EthProviderCli
} }
run(buildflags.RPCAddr, buildflags.NodeAddr) run(buildflags.RPCAddr, buildflags.NodeAddr)
......
...@@ -65,7 +65,7 @@ func main() { ...@@ -65,7 +65,7 @@ func main() {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
var wg sync.WaitGroup var wg sync.WaitGroup
log.Info("db info:", " Dbdriver = ", cfg.SyncTxConfig.Dbdriver, ", DbPath = ", cfg.SyncTxConfig.DbPath, ", DbCache = ", cfg.SyncTxConfig.DbCache, ", EthProvider = ", cfg.EthProvider) log.Info("db info:", " Dbdriver = ", cfg.SyncTxConfig.Dbdriver, ", DbPath = ", cfg.SyncTxConfig.DbPath, ", DbCache = ", cfg.SyncTxConfig.DbCache)
log.Info("deploy info:", "BridgeRegistry", cfg.BridgeRegistry) log.Info("deploy info:", "BridgeRegistry", cfg.BridgeRegistry)
mainlog.Info("db info:", " Dbdriver = ", cfg.SyncTxConfig.Dbdriver, ", DbPath = ", cfg.SyncTxConfig.DbPath, ", DbCache = ", cfg.SyncTxConfig.DbCache) mainlog.Info("db info:", " Dbdriver = ", cfg.SyncTxConfig.Dbdriver, ", DbPath = ", cfg.SyncTxConfig.DbPath, ", DbCache = ", cfg.SyncTxConfig.DbCache)
db := dbm.NewDB("relayer_db_service", cfg.SyncTxConfig.Dbdriver, cfg.SyncTxConfig.DbPath, cfg.SyncTxConfig.DbCache) db := dbm.NewDB("relayer_db_service", cfg.SyncTxConfig.Dbdriver, cfg.SyncTxConfig.DbPath, cfg.SyncTxConfig.DbCache)
......
# 本配置文件专门用于33复杂美闪电网络使用,即lns33
title="x2Ethereum_relayer" title="x2Ethereum_relayer"
#用于cli向该relayer进行配置 #用于cli向该relayer进行配置
JrpcBindAddr="localhost:9901" JrpcBindAddr="localhost:9901"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment