Move magic number to conf/limit

Qi Xiao · Qi Xiao · commit 2748d31e79e9 · 2019-01-29T16:51:14.000+08:00
diff --git a/conf/limits.go b/conf/limits.go
@@ -24,4 +24,6 @@ const (
 	MaxPendingTxsPerAccount = 1000
 	// MaxTransactionsPerBlock defines the limit of transactions per block.
 	MaxTransactionsPerBlock = 10000
+	// MaxRPCPoolPhysicalConnection defines max underlying physical connection for one node pair.
+	MaxRPCPoolPhysicalConnection = 10
 )
diff --git a/rpc/pool.go b/rpc/pool.go
@@ -20,14 +20,12 @@ import (
 	"net"
 	"sync"
 
+	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/pkg/errors"
 	mux "github.com/xtaci/smux"
 )
 
-// MaxPhysicalConnection defines max underlying physical connection for one node pair.
-const MaxPhysicalConnection = 10
-
 // SessPool is the session pool interface
 type SessPool interface {
 	Get(proto.NodeID) (net.Conn, error)
@@ -77,7 +75,7 @@ func (s *Session) Get() (conn net.Conn, err error) {
 	s.Lock()
 	defer s.Unlock()
 	s.offset++
-	s.offset %= MaxPhysicalConnection
+	s.offset %= conf.MaxRPCPoolPhysicalConnection
 
 	var (
 		sess     *mux.Session
diff --git a/rpc/pool_test.go b/rpc/pool_test.go
@@ -22,6 +22,7 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/utils"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
@@ -32,7 +33,7 @@ import (
 const (
 	localAddr   = "127.0.0.1:4444"
 	localAddr2  = "127.0.0.1:4445"
-	concurrency = 15
+	concurrency = conf.MaxRPCPoolPhysicalConnection + 1
 	packetCount = 100
 )
 
@@ -151,12 +152,12 @@ func TestNewSessionPool(t *testing.T) {
 		}
 
 		wg.Wait()
-		So(p.Len(), ShouldEqual, MaxPhysicalConnection)
+		So(p.Len(), ShouldEqual, conf.MaxRPCPoolPhysicalConnection)
 
 		server(c, localAddr2, packetCount)
 		_, err := p.Get(proto.NodeID(localAddr2))
 		So(err, ShouldBeNil)
-		So(p.Len(), ShouldEqual, MaxPhysicalConnection+1)
+		So(p.Len(), ShouldEqual, conf.MaxRPCPoolPhysicalConnection+1)
 
 		wg2 := &sync.WaitGroup{}
 		wg2.Add(concurrency)
@@ -181,10 +182,10 @@ func TestNewSessionPool(t *testing.T) {
 		}
 
 		wg2.Wait()
-		So(p.Len(), ShouldEqual, MaxPhysicalConnection*2)
+		So(p.Len(), ShouldEqual, conf.MaxRPCPoolPhysicalConnection*2)
 
 		p.Remove(proto.NodeID(localAddr2))
-		So(p.Len(), ShouldEqual, MaxPhysicalConnection)
+		So(p.Len(), ShouldEqual, conf.MaxRPCPoolPhysicalConnection)
 
 		p.Close()
 		So(p.Len(), ShouldEqual, 0)

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@ const (`
`24`	`24`	`MaxPendingTxsPerAccount = 1000`
`25`	`25`	`// MaxTransactionsPerBlock defines the limit of transactions per block.`
`26`	`26`	`MaxTransactionsPerBlock = 10000`
	`27`	`+ // MaxRPCPoolPhysicalConnection defines max underlying physical connection for one node pair.`
	`28`	`+ MaxRPCPoolPhysicalConnection = 10`
`27`	`29`	`)`