diff --git a/.gitignore b/.gitignore index 77f3caa6f6fc37daa94722af176344a89b906e79..32e22f8642d8020efaa0ac5f0190060db373bfe6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ *.tmp *.log *.test - coverage.txt report.xml +*.test.txt diff --git a/contrib/extension/subscription/conn.go b/contrib/extension/subscription/conn.go index acece572af77fce9a4565559e20a7f8b26733cc8..676cbeec65abdb7027d255fa3a12286ee7b9b54e 100644 --- a/contrib/extension/subscription/conn.go +++ b/contrib/extension/subscription/conn.go @@ -9,14 +9,14 @@ import ( type Conn interface { Subscribe(ctx context.Context, namespace string, channel any, args any) (ClientSubscription, error) - jsonrpc.StreamingConn + jsonrpc.Conn } func UpgradeConn(c jsonrpc.Conn, err error) (Conn, error) { if err != nil { return nil, err } - if val, ok := c.(jsonrpc.StreamingConn); ok { + if val, ok := c.(jsonrpc.Conn); ok { engine := NewWrapClient(val) val.Mount(engine.Middleware) return engine, nil diff --git a/pkg/jsonrpc/conn.go b/pkg/jsonrpc/conn.go index 8bed1b0a6e4f1f9f04595ff3b7474c1fc39e4d50..f0519feacb4e55f26caf7d22b21df405da6895ca 100644 --- a/pkg/jsonrpc/conn.go +++ b/pkg/jsonrpc/conn.go @@ -7,6 +7,7 @@ import ( type Conn interface { Doer + Notifier BatchCaller Mounter @@ -15,11 +16,6 @@ type Conn interface { Closed() <-chan struct{} } -type StreamingConn interface { - Conn - Notifier -} - type Doer interface { Do(ctx context.Context, result any, method string, params any) error } @@ -33,5 +29,5 @@ type Notifier interface { } type Mounter interface { - Mount(Middleware) + Mount(Handler) }