Merge pull request #4 from jpeng-go/revert-2-fix-dpos-test-para2

build/dapp-test-rpc.sh

@@ -16,7 +16,7 @@ function dapp_test_rpc() {
         dapps=$(find . -maxdepth 1 -type d ! -name dapptest ! -name . | sed 's/^\.\///' | sort)
         echo "dapps list: $dapps"
         set +e
-        parallel -k --jobs 30 --results outdir --joblog ./jobs.log ./{}/"${RPC_TESTFILE}" "$ip" ::: "$dapps"
+        parallel -k --results outdir --joblog ./jobs.log ./{}/"${RPC_TESTFILE}" "$ip" ::: "$dapps"
         local ret=$?
         if [ $ret -ne 0 ]; then
             wrongdapps=$(awk '{print $7,$9 }' jobs.log | grep -a 1 | awk -F '/' '{print $2}')

plugin/consensus/dpos/node_test.go

@@ -559,8 +559,6 @@ func initEnvDpos1(configName string) (queue.Queue, *blockchain.BlockChain, queue
 	q.SetConfig(chain33Cfg)
 	cfg := chain33Cfg.GetModuleConfig()
 	sub := chain33Cfg.GetSubConfig()
-	rpc.InitCfg(cfg.RPC)
-
 	chain := blockchain.New(chain33Cfg)
 	chain.SetQueueClient(q.Client())
 
@@ -580,6 +578,7 @@ func initEnvDpos1(configName string) (queue.Queue, *blockchain.BlockChain, queue
 
 	network.SetQueueClient(q.Client())
 
+	rpc.InitCfg(cfg.RPC)
 	gapi := rpc.NewGRpcServer(q.Client(), nil)
 	go gapi.Listen()
 

plugin/dapp/paracross/testnode/para_test.go

@@ -18,11 +18,9 @@ func TestParaNode(t *testing.T) {
 	defer para.Close()
 	//通过rpc 发生信息
 	tx := util.CreateTxWithExecer(paraCfg, para.Para.GetGenesisKey(), "user.p.test.none")
-	assert.NotNil(t, tx)
 	para.Para.SendTxRPC(tx)
 	para.Para.WaitHeight(1)
 	tx = util.CreateTxWithExecer(paraCfg, para.Para.GetGenesisKey(), "user.p.test.none")
-	assert.NotNil(t, tx)
 	para.Para.SendTxRPC(tx)
 	para.Para.WaitHeight(2)
 

plugin/dapp/paracross/testnode/paranode.go

 package testnode
 
 import (
-	"fmt"
-
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util/testnode"
 )
@@ -26,7 +24,6 @@ func NewParaNode(main *testnode.Chain33Mock, para *testnode.Chain33Mock) *ParaNo
 	}
 	if para == nil {
 		cfg := types.NewChain33Config(DefaultConfig)
-		fmt.Println("mainnode.Grpc=", main.GetCfg().RPC.GrpcBindAddr, "mainnode.jrpc=", main.GetCfg().RPC.JrpcBindAddr)
 		testnode.ModifyParaClient(cfg, main.GetCfg().RPC.GrpcBindAddr)
 		para = testnode.NewWithConfig(cfg, nil)
 		para.Listen()