fix testutils

Author: wifiboy16

.github/workflows/go.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.19
+    - name: Set up Go 1.21
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19
+        go-version: 1.21
       id: go
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
-    - name: Get dependencies
+    - name: Get qng dependencies
       run: |
         git clone https://github.com/Qitmeer/qng.git
         cd qng && make && pwd && cp ./build/bin/qng /usr/local/bin/

.gitignore

@@ -38,3 +38,4 @@ config.toml
 ca.cert
 linux-wallet
 testutils/mainnet/
+testutils/privnet/

go.mod

@@ -1,6 +1,6 @@
 module github.com/Qitmeer/qitmeer-wallet
 
-go 1.18
+go 1.19
 
 require (
 	github.com/BurntSushi/toml v1.2.0
@@ -78,7 +78,7 @@ require (
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-libp2p v0.27.8 // indirect
+	github.com/libp2p/go-libp2p v0.27.1 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -142,4 +142,5 @@ require (
 )
 
 replace github.com/ethereum/go-ethereum v1.11.5 => github.com/Qitmeer/go-ethereum v1.11.5-q.3
+
 replace github.com/karalabe/usb v0.0.2 => github.com/dindinw/karalabe-usb v0.0.0-20230613095851-cd69a62c9c30

go.sum

@@ -368,8 +368,6 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E
 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
-github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4=
-github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
@@ -410,8 +408,8 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-libp2p v0.27.8 h1:IX5x/4yKwyPQeVS2AXHZ3J4YATM9oHBGH1gBc23jBAI=
-github.com/libp2p/go-libp2p v0.27.8/go.mod h1:eCFFtd0s5i/EVKR7+5Ki8bM7qwkNW3TPTTSSW9sz8NE=
+github.com/libp2p/go-libp2p v0.27.1 h1:k1u6RHsX3hqKnslDjsSgLNURxJ3O1atIZCY4gpMbbus=
+github.com/libp2p/go-libp2p v0.27.1/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=

rpc/client/httpclient.go

@@ -5,12 +5,13 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"github.com/Qitmeer/qng/log"
 	"io/ioutil"
 	"net"
 	"net/http"
 	"time"
 
+	"github.com/Qitmeer/qng/log"
+
 	"github.com/samuel/go-socks/socks"
 )
 
@@ -90,15 +91,15 @@ func (e RPCError) Error() string {
 	return fmt.Sprintf("%d: %s", e.Code, e.Message)
 }
 
-//Request json req
+// Request json req
 type Request struct {
 	Jsonrpc string            `json:"jsonrpc"`
 	Method  string            `json:"method"`
 	Params  []json.RawMessage `json:"params"`
 	ID      interface{}       `json:"id"`
 }
 
-//makeRequestData
+// makeRequestData
 func MakeRequestData(rpcVersion string, id interface{}, method string, params []interface{}) ([]byte, error) {
 	// default to JSON-RPC 1.0 if RPC type is not specified
 	if rpcVersion != "2.0" && rpcVersion != "1.0" {
@@ -135,7 +136,7 @@ func MakeRequestData(rpcVersion string, id interface{}, method string, params []
 	return reqData, nil
 }
 
-//IsValidIDType id string number
+// IsValidIDType id string number
 func IsValidIDType(id interface{}) bool {
 	switch id.(type) {
 	case int, int8, int16, int32, int64,

rpc/walletrpc/methods_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+
 	"github.com/Qitmeer/qitmeer-wallet/config"
 	"github.com/Qitmeer/qng/log"
 
@@ -44,8 +45,8 @@ func TestGetSyncHeight(t *testing.T) {
 }
 
 func openWallet() (*wallet.Wallet, error) {
-	dbpath := "/Users/luoshan/Library/Application Support/Qitwallet/testnet"
-	tomlpath := "/Users/luoshan/GolandProjects/qitmeer-wallet/config.toml"
+	dbpath := "/Qitwallet/testnet"
+	tomlpath := "/qitmeer-wallet/config.toml"
 	pubpass := "public"
 	dbpass := "123456"
 	err := config.LoadConfig(tomlpath)
@@ -77,7 +78,7 @@ func openWallet() (*wallet.Wallet, error) {
 
 func test_wallet_createNewAccount(w *wallet.Wallet) error {
 	cmd := &qitmeerjson.CreateNewAccountCmd{
-		Account: "luoshan4",
+		Account: "test1",
 	}
 	msg, err := CreateNewAccount(cmd, w)
 	if err != nil {

testutils/harness.go

@@ -6,16 +6,18 @@ package testutils
 
 import (
 	"fmt"
-	"github.com/Qitmeer/qng/core/protocol"
-	"github.com/Qitmeer/qng/params"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"io/ioutil"
+	"math/rand"
 	"net"
 	"os"
 	"strconv"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/Qitmeer/qng/core/protocol"
+	"github.com/Qitmeer/qng/params"
+	"github.com/ethereum/go-ethereum/ethclient"
 )
 
 const DefaultMaxRpcConnRetries = 10
@@ -161,7 +163,7 @@ func NewHarnessWithMnemonic(t *testing.T, mnemonic, path string, usePkAddr bool,
 	defer harnessStateMutex.Unlock()
 	id := len(harnessInstances)
 	// create temporary folder
-	testDir, err := ioutil.TempDir("", "test-harness-"+strconv.Itoa(id)+"-*")
+	testDir, err := ioutil.TempDir("", "test-harness-"+strconv.Itoa(int(time.Now().UnixNano())+id)+"-*")
 	if err != nil {
 		return nil, err
 	}
@@ -248,24 +250,30 @@ func AllHarnesses() []*Harness {
 
 const (
 	// the minimum and maximum p2p and rpc port numbers used by a test harness.
-	minP2PPort   = 28200               // 28200 The min is inclusive
-	maxP2PPort   = minP2PPort + 10000  // 38199 The max is exclusive
-	minRPCPort   = maxP2PPort          // 38200
-	maxRPCPort   = minRPCPort + 10000  // 48199
-	minEVMPort   = maxRPCPort          // 48200
-	maxEVMPort   = minEVMPort + 2000   // 53199
-	minEVMWSPort = maxEVMPort          // 53200
-	maxEVMWSPort = minEVMWSPort + 2000 // 58199
+	minP2PPort   = 18200               // 18200 The min is inclusive
+	maxP2PPort   = minP2PPort + 1000   // 19199 The max is exclusive
+	minRPCPort   = maxP2PPort          // 19200
+	maxRPCPort   = minRPCPort + 1000   // 30199
+	minEVMPort   = maxRPCPort          // 30200
+	maxEVMPort   = minEVMPort + 1000   // 31199
+	minEVMWSPort = maxEVMPort          // 31200
+	maxEVMWSPort = minEVMWSPort + 1000 // 32199
 )
 
+var argsLock sync.Mutex
+
 // GenListenArgs returns auto generated args for p2p listen and rpc listen in the format of
 // ["--listen=127.0.0.1:12345", --rpclisten=127.0.0.1:12346"].
 // in order to support multiple test node running at the same time.
 func genListenArgs() (string, string, string, string) {
+	argsLock.Lock()
+	defer argsLock.Unlock()
 	localhost := "127.0.0.1"
 	genPort := func(min, max int) string {
-		port := min + len(harnessInstances) + (42 * harnessMainProcessId % (max - min))
-		return strconv.Itoa(port)
+		rand.Seed(time.Now().UnixNano() + int64(len(harnessInstances)))
+		return fmt.Sprintf("%d", rand.Intn(max-min)+min)
+		// port := min + len(harnessInstances) + (42 * harnessMainProcessId % (max - min))
+		// return strconv.Itoa(port)
 	}
 	p2p := net.JoinHostPort(localhost, genPort(minP2PPort, maxP2PPort))
 	rpc := net.JoinHostPort(localhost, genPort(minRPCPort, maxRPCPort))

testutils/harness_test.go

@@ -5,12 +5,14 @@
 package testutils
 
 import (
+	"encoding/json"
 	"fmt"
-	"github.com/Qitmeer/qng/core/types"
-	"github.com/Qitmeer/qng/params"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/Qitmeer/qng/core/types"
+	"github.com/Qitmeer/qng/params"
 )
 
 func TestHarness(t *testing.T) {
@@ -91,6 +93,7 @@ func TestSyncUnConfirmedCoinBase(t *testing.T) {
 	}
 
 	h.WaitWalletInit()
+	time.Sleep(10 * time.Second)
 	if info, err := h.Client.NodeInfo(); err != nil {
 		t.Errorf("test failed : %v", err)
 		return
@@ -100,7 +103,6 @@ func TestSyncUnConfirmedCoinBase(t *testing.T) {
 			t.Errorf("test failed, expect %v , but got %v", expect, info.Network)
 			return
 		}
-
 	}
 	GenerateBlock(t, h, 10)
 	time.Sleep(10 * time.Second)
@@ -131,6 +133,7 @@ func TestSyncConfirmedCoinBase(t *testing.T) {
 	}
 
 	h.WaitWalletInit()
+	time.Sleep(10 * time.Second)
 	if info, err := h.Client.NodeInfo(); err != nil {
 		t.Errorf("test failed : %v", err)
 		return
@@ -142,22 +145,20 @@ func TestSyncConfirmedCoinBase(t *testing.T) {
 		}
 
 	}
-	GenerateBlock(t, h, 20)
-	time.Sleep(10 * time.Second)
-
-	GenerateBlock(t, h, 1)
-	time.Sleep(10 * time.Second)
+	GenerateBlock(t, h, 18)
+	time.Sleep(15 * time.Second)
 	b, err := h.wallet.Balance(types.MEERA)
 	if err != nil {
 		t.Errorf("test failed : %v", err)
 		return
 	}
-	if b.UnspentAmount.Value != 250000000000 {
-		t.Errorf("test failed, expect unspent balance %d, but got %d", 250000000000, b.UnspentAmount.Value)
+	b1, _ := json.Marshal(b)
+	if b.UnspentAmount.Value != 100000000000 {
+		t.Errorf("test failed, expect unspent balance %d, but got %d %v", 100000000000, b.UnspentAmount.Value, string(b1))
 		return
 	}
 	if b.UnconfirmedAmount.Value != 800000000000 {
-		t.Errorf("test failed, expect unconfirmed balance %d, but got %d", 800000000000, b.UnspentAmount.Value)
+		t.Errorf("test failed, expect unconfirmed balance %d, but got %d %v", 800000000000, b.UnspentAmount.Value, string(b1))
 		return
 	}
 }
@@ -177,7 +178,7 @@ func TestSpent(t *testing.T) {
 		return
 	}
 	h.WaitWalletInit()
-
+	time.Sleep(10 * time.Second)
 	if info, err := h.Client.NodeInfo(); err != nil {
 		t.Errorf("test failed : %v", err)
 		return
@@ -189,26 +190,27 @@ func TestSpent(t *testing.T) {
 		}
 
 	}
-	GenerateBlock(t, h, 20)
-	time.Sleep(10 * time.Second)
-	GenerateBlock(t, h, 1)
+	GenerateBlock(t, h, 18)
 	time.Sleep(10 * time.Second)
 	b, err := h.wallet.Balance(types.MEERA)
 	if err != nil {
 		t.Errorf("test failed : %v", err)
 		return
 	}
-	_, err = h.wallet.SendToAddress("RmV7i7JoomcHuQCVMN66SiTYUCkRtzQ6fSf", types.MEERA, 1000)
+	_, err = h.wallet.SendToAddress("RmV7i7JoomcHuQCVMN66SiTYUCkRtzQ6fSf", types.MEERA, 498)
 	if err != nil {
 		t.Errorf("test failed, %v", err)
+		return
 	}
+	GenerateBlock(t, h, 1)
+	time.Sleep(10 * time.Second)
 	b, err = h.wallet.Balance(types.MEERA)
 	if err != nil {
 		t.Errorf("test failed : %v", err)
 		return
 	}
-	if b.SpendAmount.Value != 150000000000 {
-		t.Errorf("test failed, expect spent balance %d, but got %d", 200000000000, b.UnspentAmount.Value)
+	if b.SpendAmount.Value != 50000000000 {
+		t.Errorf("test failed, expect spent balance %d, but got %d", 50000000000, b.SpendAmount.Value)
 		return
 	}
 	GenerateBlock(t, h, 1)

testutils/node.go

@@ -7,14 +7,16 @@ package testutils
 import (
 	"bufio"
 	"fmt"
-	"github.com/Qitmeer/qng/params"
-	"github.com/Qitmeer/qng/rpc"
 	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"sync"
 	"testing"
+
+	"github.com/Qitmeer/qng/params"
+	"github.com/Qitmeer/qng/rpc"
 )
 
 // the configuration of the node
@@ -59,6 +61,8 @@ func (n *nodeConfig) args() []string {
 	args := []string{}
 	if n.listen != "" {
 		args = append(args, fmt.Sprintf("--listen=%s", n.listen))
+		port := strings.Split(n.listen, ":")[1]
+		args = append(args, fmt.Sprintf("--port=%s", port))
 	}
 	if n.rpclisten != "" {
 		args = append(args, fmt.Sprintf("--rpclisten=%s", n.rpclisten))

testutils/node_test.go

@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"reflect"
 	"regexp"
+	"strings"
 	"testing"
 	"time"
 )
@@ -29,6 +30,7 @@ func TestNewNodeCmdArgs(t *testing.T) {
 	args := []string{
 		"qng",
 		"--listen=127.0.0.1:38130",
+		"--port=38130",
 		"--rpclisten=127.0.0.1:38131",
 		"--rpcuser=testuser",
 		"--rpcpass=testpass",
@@ -53,7 +55,7 @@ func TestNewNodeCmdArgs(t *testing.T) {
 }
 
 func TestNodeStartStop(t *testing.T) {
-	found, err := exec.LookPath("qitmeer")
+	found, err := exec.LookPath("qng")
 	if err != nil {
 		t.Skip(fmt.Sprintf("skip the test since: %v", err))
 	} else {
@@ -84,6 +86,7 @@ func TestGenListenArgs(t *testing.T) {
 	c.listen, c.rpclisten, c.evmlisten, c.evmWSlisten = a1, a2, a3, a4
 	args := []string{
 		"--listen=" + a1,
+		"--port=" + strings.Split(a1, ":")[1],
 		"--rpclisten=" + a2,
 		fmt.Sprintf(`--evmenv="--http --http.port=%s --ws --ws.port=%s"`, a3, a4),
 		"--rpcuser=testuser",