Merge pull request #182 from meshplus/fix/bxh-addrs-override

fix(repo): remove default bxh addrs config

Author: sandyzhou

cmd/pier/appchain_bxh.go

@@ -250,7 +250,7 @@ func loadClient(keyPath string, grpcAddrs []string, ctx *cli.Context) (rpcx.Clie
 		}
 		nodesInfo = append(nodesInfo, nodeInfo)
 	}
-	opts = append(opts, rpcx.WithNodesInfo(nodesInfo...))
+	opts = append(opts, rpcx.WithNodesInfo(nodesInfo...), rpcx.WithTimeoutLimit(config.Mode.Relay.TimeoutLimit))
 	return rpcx.New(opts...)
 }
 

config/pier.toml

@@ -26,6 +26,7 @@ report_caller = false
 type = "relay" # relay, direct or union
 [mode.relay]
 addrs = ["localhost:60011", "localhost:60012", "localhost:60013", "localhost:60014"]
+timeout_limit = "1s"
 quorum = 2
 validators = [
     "0x000f1a7a08ccc48e5d30f80850cf1cf283aa3abd",

internal/app/pier.go

@@ -145,7 +145,7 @@ func NewPier(repoRoot string, config *repo.Config) (*Pier, error) {
 			}
 			nodesInfo = append(nodesInfo, nodeInfo)
 		}
-		opts = append(opts, rpcx.WithNodesInfo(nodesInfo...))
+		opts = append(opts, rpcx.WithNodesInfo(nodesInfo...), rpcx.WithTimeoutLimit(config.Mode.Relay.TimeoutLimit))
 		client, err := rpcx.New(opts...)
 		if err != nil {
 			return nil, fmt.Errorf("create bitxhub client: %w", err)
@@ -303,7 +303,7 @@ func NewUnionPier(repoRoot string, config *repo.Config) (*Pier, error) {
 		}
 		nodesInfo = append(nodesInfo, nodeInfo)
 	}
-	opts = append(opts, rpcx.WithNodesInfo(nodesInfo...))
+	opts = append(opts, rpcx.WithNodesInfo(nodesInfo...), rpcx.WithTimeoutLimit(config.Mode.Relay.TimeoutLimit))
 	client, err := rpcx.New(opts...)
 	if err != nil {
 		return nil, fmt.Errorf("create bitxhub client: %w", err)

internal/repo/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/meshplus/bitxhub-kit/fileutil"
 	"github.com/meshplus/bitxhub-kit/types"
@@ -54,9 +55,10 @@ type Mode struct {
 
 // Relay are configs about bitxhub
 type Relay struct {
-	Addrs      []string `toml:"addrs" json:"addrs"`
-	Quorum     uint64   `toml:"quorum" json:"quorum"`
-	Validators []string `toml:"validators" json:"validators"`
+	Addrs        []string      `toml:"addrs" json:"addrs"`
+	TimeoutLimit time.Duration `mapstructure:"timeout_limit" json:"timeout_limit"`
+	Quorum       uint64        `toml:"quorum" json:"quorum"`
+	Validators   []string      `toml:"validators" json:"validators"`
 }
 
 type Direct struct {
@@ -118,12 +120,7 @@ func DefaultConfig() *Config {
 		Mode: Mode{
 			Type: "relay",
 			Relay: Relay{
-				Addrs: []string{
-					"localhost:60011",
-					"localhost:60012",
-					"localhost:60013",
-					"localhost:60014",
-				},
+				Addrs:  []string{"localhost:60011"},
 				Quorum: 2,
 				Validators: []string{
 					"0x000f1a7a08ccc48e5d30f80850cf1cf283aa3abd",