From ed12d98fba1a63f275b7e41831657e662f18b63e Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 24 Dec 2020 11:53:05 +0100 Subject: [PATCH] Renaming analyzers NewServerCodec to NewAnalyzerServerCodec --- analyzers/codec.go | 4 +++- analyzers/codec_test.go | 2 +- cores/caps.go | 4 ++-- cores/caps_test.go | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/analyzers/codec.go b/analyzers/codec.go index 0428095a7..4110f641a 100644 --- a/analyzers/codec.go +++ b/analyzers/codec.go @@ -24,7 +24,7 @@ import ( "time" ) -func NewServerCodec(sc rpc.ServerCodec, aS *AnalyzerService, enc, from, to string) rpc.ServerCodec { +func NewAnalyzerServerCodec(sc rpc.ServerCodec, aS *AnalyzerService, enc, from, to string) rpc.ServerCodec { return &AnalyzerServerCodec{ sc: sc, reqs: make(map[uint64]*rpcAPI), @@ -68,6 +68,7 @@ func (c *AnalyzerServerCodec) ReadRequestBody(x interface{}) (err error) { c.reqsLk.Unlock() return } + func (c *AnalyzerServerCodec) WriteResponse(r *rpc.Response, x interface{}) error { c.reqsLk.Lock() api := c.reqs[c.reqIdx] @@ -76,4 +77,5 @@ func (c *AnalyzerServerCodec) WriteResponse(r *rpc.Response, x interface{}) erro go c.aS.logTrafic(api.ID, api.Method, api.Params, x, r.Error, c.enc, c.from, c.to, api.StartTime, time.Now()) return c.sc.WriteResponse(r, x) } + func (c *AnalyzerServerCodec) Close() error { return c.sc.Close() } diff --git a/analyzers/codec_test.go b/analyzers/codec_test.go index 6be3683f7..7f1f0d8fa 100644 --- a/analyzers/codec_test.go +++ b/analyzers/codec_test.go @@ -61,7 +61,7 @@ func TestNewServerCodec(t *testing.T) { t.Fatal(err) } - codec := NewServerCodec(new(mockServerCodec), anz, utils.MetaJSON, "127.0.0.1:5565", "127.0.0.1:2012") + codec := NewAnalyzerServerCodec(new(mockServerCodec), anz, utils.MetaJSON, "127.0.0.1:5565", "127.0.0.1:2012") r := new(rpc.Request) expR := &rpc.Request{ Seq: 0, diff --git a/cores/caps.go b/cores/caps.go index 9b6df467a..b75cc6ed1 100644 --- a/cores/caps.go +++ b/cores/caps.go @@ -49,7 +49,7 @@ func newCapsGOBCodec(conn conn, caps *engine.Caps, anz *analyzers.AnalyzerServic if to != nil { tostr = to.String() } - return analyzers.NewServerCodec(r, anz, utils.MetaGOB, fromstr, tostr) + return analyzers.NewAnalyzerServerCodec(r, anz, utils.MetaGOB, fromstr, tostr) } return } @@ -67,7 +67,7 @@ func newCapsJSONCodec(conn conn, caps *engine.Caps, anz *analyzers.AnalyzerServi if to != nil { tostr = to.String() } - return analyzers.NewServerCodec(r, anz, utils.MetaJSON, fromstr, tostr) + return analyzers.NewAnalyzerServerCodec(r, anz, utils.MetaJSON, fromstr, tostr) } return } diff --git a/cores/caps_test.go b/cores/caps_test.go index 958026aaa..8f375cebe 100644 --- a/cores/caps_test.go +++ b/cores/caps_test.go @@ -116,7 +116,7 @@ func TestNewCapsGOBCodec(t *testing.T) { if r := newCapsGOBCodec(conn, cr, nil); !reflect.DeepEqual(r, exp) { t.Errorf("Expected: %v ,received:%v", exp, r) } - exp = analyzers.NewServerCodec(newGobServerCodec(conn), anz, utils.MetaGOB, utils.Local, utils.Local) + exp = analyzers.NewAnalyzerServerCodec(newGobServerCodec(conn), anz, utils.MetaGOB, utils.Local, utils.Local) if r := newCapsGOBCodec(conn, cr, anz); !reflect.DeepEqual(r, exp) { t.Errorf("Expected: %v ,received:%v", exp, r) } @@ -130,7 +130,7 @@ func TestNewCapsJSONCodec(t *testing.T) { if r := newCapsJSONCodec(conn, cr, nil); !reflect.DeepEqual(r, exp) { t.Errorf("Expected: %v ,received:%v", exp, r) } - exp = analyzers.NewServerCodec(jsonrpc.NewServerCodec(conn), anz, utils.MetaJSON, utils.Local, utils.Local) + exp = analyzers.NewAnalyzerServerCodec(jsonrpc.NewServerCodec(conn), anz, utils.MetaJSON, utils.Local, utils.Local) if r := newCapsJSONCodec(conn, cr, anz); !reflect.DeepEqual(r, exp) { t.Errorf("Expected: %v ,received:%v", exp, r) }