update new tps

Author: litrane

.gitignore

@@ -0,0 +1,3 @@
+*.log
+*.out
+*.exe

client.go

@@ -94,10 +94,10 @@ func parse(jsonBytes []byte, transfer_type string) (int, time.Duration, error) {
 					var test RPCResult
 
 					json.Unmarshal(value["receipt"], &test)
-					fmt.Println(string(value["receipt"]))
+					//fmt.Println(string(value["receipt"]))
 					if len(test.Result) != 0 {
 						result += len(test.Result)
-						fmt.Println(string(value["receipt"]))
+						//fmt.Println(string(value["receipt"]))
 					}
 
 				} else if transfer_type == "InChain" {
@@ -385,6 +385,7 @@ func (c EthClient) Erc20TransferFrom(ctx context.Context, privHex string, nonce
 	//res, err := erc20Instance.TransferFrom(auth, fromAddress, toAddress, big.NewInt(int64(tokenAmount)))
 
 	res, err := erc20Instance.Transfer(auth, toAddress, big.NewInt(int64(tokenAmount)))
+	
 	//fmt.Println(res.Hash().Hex())
 	if err != nil {
 		return common.BytesToHash([]byte("")), err
@@ -482,9 +483,14 @@ func (c EthClient) CrossChainTNT20Transfer(ctx context.Context, privHex string,
 	// fmt.Println(receipt.Logs[2].Data)
 	//resolveNum := Resolve(receipt.Logs[2].Data)
 
+	if CountNum == 0 {
+		startTime = time.Now()
+	}
 	CountNum += 1
 	if CountNum%100 == 0 {
 		fmt.Println("already send ", CountNum)
+		fmt.Println("send 100 txes use", time.Since(startTime))
+		startTime = time.Now()
 	}
 	return res.Hash(), nil
 }

main.go

@@ -63,6 +63,7 @@ var (
 	avgLatency       time.Duration
 	mutex            sync.Mutex
 	CountNum         int
+	startTime        time.Time
 	chainID          = big.NewInt(360001) // 366 360777
 	Erc20Address     = ""
 	TokenBankAddress = "0x47e9Fbef8C83A1714F1951F142132E6e90F5fa5D" // subchain 0x47e9Fbef8C83A1714F1951F142132E6e90F5fa5D mainchain 0x2Ce636d6240f8955d085a896e12429f8B3c7db26
@@ -124,22 +125,22 @@ func main() {
 		crossSubChainTNT20StressTest(&client_list, ctx)
 	}
 	if clientID == 0 {
-		//var newclient1 EthClient
-		var newclient2 EthClient
+		var newclient1 EthClient
+		//var newclient2 EthClient
 		//在跨链测试时需要开一个新的client在另一条链进行监测
-		//newclient1, err = NewClient("http://10.10.1.1:16888/rpc", "http://10.10.1.9:18888/rpc") // subchain 16900 19888 sidechain "http://127.0.0.1:17900/rpc", "http://127.0.0.1:19988/rpc" mainchain "http://127.0.0.1:16888/rpc", "http://127.0.0.1:18888/rpc"
-		//newclient1.transfer_type = "CrossChain"
+		newclient1, err = NewClient("http://10.10.1.1:16888/rpc", "http://10.10.1.9:18888/rpc") // subchain 16900 19888 sidechain "http://127.0.0.1:17900/rpc", "http://127.0.0.1:19988/rpc" mainchain "http://127.0.0.1:16888/rpc", "http://127.0.0.1:18888/rpc"
+		newclient1.transfer_type = "CrossChain"
 		//开始TPS以及延迟测量
-		//fmt.Println("-----------Start Measuring----------")
-		//tps.StartTPSMeasuring(context.Background(), &newclient1, &tpsClosing, &idlingDuration, logger, 1)
-		newclient2, err = NewClient("http://127.0.0.1:16900/rpc", "http://127.0.0.1:19888/rpc") // subchain 16900 19888 sidechain "http://127.0.0.1:17900/rpc", "http://127.0.0.1:19988/rpc" mainchain "http://127.0.0.1:16888/rpc", "http://127.0.0.1:18888/rpc"
-		newclient2.transfer_type = "InChain"
-		// //开始TPS以及延迟测量
 		fmt.Println("-----------Start Measuring----------")
-		if err = tps.StartTPSMeasuring(context.Background(), &newclient2, &tpsClosing, &idlingDuration, logger, 2); err != nil {
-			fmt.Println("err StartTPSMeasuring:", err)
-			logger.Fatal("err StartTPSMeasuring: ", err)
-		}
+		tps.StartTPSMeasuring(context.Background(), &newclient1, &tpsClosing, &idlingDuration, logger, 1)
+		// newclient2, err = NewClient("http://127.0.0.1:16900/rpc", "http://127.0.0.1:19888/rpc") // subchain 16900 19888 sidechain "http://127.0.0.1:17900/rpc", "http://127.0.0.1:19988/rpc" mainchain "http://127.0.0.1:16888/rpc", "http://127.0.0.1:18888/rpc"
+		// newclient2.transfer_type = "InChain"
+		// // //开始TPS以及延迟测量
+		// fmt.Println("-----------Start Measuring----------")
+		// if err = tps.StartTPSMeasuring(context.Background(), &newclient2, &tpsClosing, &idlingDuration, logger, 2); err != nil {
+		// 	fmt.Println("err StartTPSMeasuring:", err)
+		// 	logger.Fatal("err StartTPSMeasuring: ", err)
+		// }
 	} else {
 		time.Sleep(mesuringDuration)
 	}

out.txt

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"sync/atomic"
+	"time"
 
 	"github.com/blockchain-tps-test/samples/theta/tps"
 	"github.com/pkg/errors"
@@ -235,7 +236,7 @@ func crossSubChainTNT20StressTest(client *[]EthClient, ctx context.Context) {
 				fmt.Println("have send 100")
 
 			}
-			//time.Sleep(time.Duration(interval) * time.Millisecond)
+			time.Sleep(time.Duration(interval) * time.Millisecond)
 			//if count%crossPercentage == 0 {
 			queue.Push(&EthTask{
 				to:            "0x27F6F1bb3e2977c3CB014e7d4B5639bB133A6032",
@@ -244,12 +245,12 @@ func crossSubChainTNT20StressTest(client *[]EthClient, ctx context.Context) {
 				transfer_type: "CrossChain",
 			})
 			// } else {
-			// 	queue.Push(&EthTask{
-			// 		to:            "0x27F6F1bb3e2977c3CB014e7d4B5639bB133A6032",
-			// 		amount:        1,
-			// 		tokenId:       int64(count),
-			// 		transfer_type: "InChain",
-			// 	})
+			// queue.Push(&EthTask{
+			// 	to:            "0x27F6F1bb3e2977c3CB014e7d4B5639bB133A6032",
+			// 	amount:        1,
+			// 	tokenId:       int64(count),
+			// 	transfer_type: "InChain",
+			// })
 			// }
 
 			//count++

stressCross.go

@@ -1,21 +1,13 @@
-def calculate_sum_from_log(filename):
-    total_sum = 0
-
-    with open(filename, 'r') as file:
-        for line in file:
-            if 'maxNumsTxs:' in line:
-                parts = line.split('maxNumsTxs:')
-                if len(parts) > 1:
-                    num_str = parts[1].strip()
-                    try:
-                        num = int(num_str)
-                        total_sum += num
-                    except ValueError:
-                        pass
-
-    return total_sum
-
-
-filename = 'output.log'
-sum_maxNumsTxs = calculate_sum_from_log(filename)
-print(f"Sum of maxNumsTxs: sum_maxNumsTxs={sum_maxNumsTxs}")
+import re
+
+# 定义正则表达式模式
+pattern = r'.*map size.*'
+
+# 打开输入文件和输出文件
+with open('./outputmain.log', 'r') as input_file, open('out.txt', 'w') as output_file:
+    # 逐行读取输入文件
+    for line in input_file:
+        # 使用正则表达式匹配每一行
+        if re.match(pattern, line):
+            # 如果匹配成功，将该行写入输出文件
+            output_file.write(line)

test.py

@@ -31,9 +31,9 @@ def calculate_tx_num_sum(filename, start_height, end_height):
     return total_tx_num
 
 
-filename = 'output.log'
-start_height = 36
-end_height = 79
+filename = 'output1'
+start_height = 56
+end_height = 110
 sum_tx_num = calculate_tx_num_sum(filename, start_height, end_height)
 print(
     f"Sum of tx num from block.height {start_height} to {end_height}: {sum_tx_num}")