Optimize tx test tool log printing

diff --git a/tools/sendbulktx/core/send_tx.go b/tools/sendbulktx/core/send_tx.go
index 4b9ff80..cc723ec 100644 (file)
--- a/tools/sendbulktx/core/send_tx.go
+++ b/tools/sendbulktx/core/send_tx.go
@@ -5,6 +5,7 @@ import (
        "fmt"
        "os"
        "strings"
+       "sync/atomic"
 
        "github.com/bytom/api"
        "github.com/bytom/blockchain/txbuilder"
@@ -185,7 +186,7 @@ func SendReq(method string, args []string) (interface{}, bool) {
 }
 
 // Sendbulktx send asset tx
-func Sendbulktx(threadTxNum int, txBtmNum string, sendAcct string, sendasset string, controlPrograms []string, txidChan chan string) {
+func Sendbulktx(threadTxNum int, txBtmNum string, sendAcct string, sendasset string, controlPrograms []string, txidChan chan string, index *uint64) {
        arrayLen := len(controlPrograms)
        for i := 0; i < threadTxNum; i++ {
                //build tx
@@ -222,6 +223,9 @@ func Sendbulktx(threadTxNum int, txBtmNum string, sendAcct string, sendasset str
                        txidChan <- ""
                        continue
                }
+
+               atomic.AddUint64(index, 1)
+               fmt.Println("tx num:", atomic.LoadUint64(index), " txid:", resp)
                type txID struct {
                        Txid string `json:"tx_id"`
                }

diff --git a/tools/sendbulktx/core/tool.go b/tools/sendbulktx/core/tool.go
index f1622d1..37cdbaf 100644 (file)
--- a/tools/sendbulktx/core/tool.go
+++ b/tools/sendbulktx/core/tool.go
@@ -74,8 +74,9 @@ var sendTxCmd = &cobra.Command{
                txBtm := fmt.Sprintf("%d", assetNum)
                fmt.Println("*****************send tx start*****************")
                // send btm to account
+               index := uint64(0)
                for i := 0; i < thdNum; i++ {
-                       go Sendbulktx(thdTxNum, txBtm, sendAcct, sendasset, controlPrograms, txidChan)
+                       go Sendbulktx(thdTxNum, txBtm, sendAcct, sendasset, controlPrograms, txidChan, &index)
                }
 
                txs := list.New()

diff --git a/tools/sendbulktx/core/util.go b/tools/sendbulktx/core/util.go
index 97d084a..5443f74 100644 (file)
--- a/tools/sendbulktx/core/util.go
+++ b/tools/sendbulktx/core/util.go
@@ -6,6 +6,7 @@ import (
        "github.com/bytom/api"
        "github.com/bytom/blockchain/rpc"
        "github.com/bytom/env"
+       jww "github.com/spf13/jwalterweatherman"
 )
 
 const (
@@ -44,11 +45,11 @@ func ClientCall(path string, req ...interface{}) (interface{}, int) {
 
        client := MustRPCClient()
        client.Call(context.Background(), path, request, response)
-
        switch response.Status {
        case api.FAIL:
                return nil, ErrRemote
        case "":
+               jww.ERROR.Println("Unable to connect to the bytomd")
                return nil, ErrConnect
        }