Skip to content

Commit 219a94a

Browse files
leventeliuleventeliu
committed
Refactor rpc package
1 parent 519f53d commit 219a94a

29 files changed

Lines changed: 976 additions & 1611 deletions

‎'‎

Lines changed: 0 additions & 182 deletions
This file was deleted.

‎client/helper_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"github.com/CovenantSQL/CovenantSQL/crypto/kms"
3535
"github.com/CovenantSQL/CovenantSQL/proto"
3636
"github.com/CovenantSQL/CovenantSQL/route"
37+
rrpc "github.com/CovenantSQL/CovenantSQL/rpc"
3738
rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
3839
"github.com/CovenantSQL/CovenantSQL/types"
3940
"github.com/CovenantSQL/CovenantSQL/utils"
@@ -233,7 +234,7 @@ func initNode() (cleanupFunc func(), tempDir string, server *rpc.Server, err err
233234
}
234235

235236
// init rpc
236-
if server, err = rpc.NewServerWithService(rpc.ServiceMap{route.DHTRPCName: dht}); err != nil {
237+
if server, err = rpc.NewServerWithService(rrpc.ServiceMap{route.DHTRPCName: dht}); err != nil {
237238
return
238239
}
239240

‎cmd/cqld/bench_test.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"github.com/CovenantSQL/CovenantSQL/crypto/kms"
3434
"github.com/CovenantSQL/CovenantSQL/proto"
3535
"github.com/CovenantSQL/CovenantSQL/route"
36+
rrpc "github.com/CovenantSQL/CovenantSQL/rpc"
3637
rpc "github.com/CovenantSQL/CovenantSQL/rpc/mux"
3738
"github.com/CovenantSQL/CovenantSQL/utils"
3839
"github.com/CovenantSQL/CovenantSQL/utils/log"
@@ -163,14 +164,11 @@ func TestStartBP_CallRPC(t *testing.T) {
163164

164165
leaderNodeID := kms.BP.NodeID
165166
var conn net.Conn
166-
var RPCClient *rpc.Client
167167

168-
if conn, err = rpc.DialToNodeWithPool(rpc.GetSessionPoolInstance(), leaderNodeID, false); err != nil {
169-
t.Fatal(err)
170-
}
171-
if RPCClient, err = rpc.InitClientConn(conn); err != nil {
168+
if conn, err = rrpc.DialToNodeWithPool(rpc.GetSessionPoolInstance(), leaderNodeID, false); err != nil {
172169
t.Fatal(err)
173170
}
171+
RPCClient := rrpc.NewClientWithConn(conn)
174172

175173
nodePayload := proto.NewNode()
176174
nodePayload.InitNodeCryptoInfo(100 * time.Millisecond)
@@ -294,14 +292,11 @@ func BenchmarkKVServer_GetAllNodeInfo(b *testing.B) {
294292

295293
leaderNodeID := kms.BP.NodeID
296294
var conn net.Conn
297-
var RPCClient *rpc.Client
298295

299-
if conn, err = rpc.DialToNodeWithPool(rpc.GetSessionPoolInstance(), leaderNodeID, false); err != nil {
300-
return
301-
}
302-
if RPCClient, err = rpc.InitClientConn(conn); err != nil {
296+
if conn, err = rrpc.DialToNodeWithPool(rpc.GetSessionPoolInstance(), leaderNodeID, false); err != nil {
303297
return
304298
}
299+
RPCClient := rrpc.NewClientWithConn(conn)
305300

306301
var reqType = "FindNeighbor"
307302
nodePayload := proto.NewNode()

0 commit comments

Comments
 (0)