Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement removing from filter by ws #570

Merged
merged 13 commits into from
Jul 27, 2022
Merged

Implement removing from filter by ws #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c7d859d
Implement removing from filter by ws
0xAleksaOpacic May 30, 2022
dfa9cf9
Remove feedback from RemoveFilterByWs method
0xAleksaOpacic Jul 7, 2022
dd60f2d
Add filterByWs map
0xAleksaOpacic Jul 7, 2022
865b2c3
delete from filterByWsConn by filterId
0xAleksaOpacic Jul 7, 2022
756512e
Merge remote-tracking branch 'origin/develop' into testBranch/validat…
0xAleksaOpacic Jul 13, 2022
af9f7ff
change logic 3rd time :)
0xAleksaOpacic Jul 19, 2022
a9f8778
Merge branch 'develop' into testBranch/validate_idea_for_removing_ws_…
zivkovicmilos Jul 25, 2022
b13e4cf
Minor cleanup
zivkovicmilos Jul 25, 2022
e55be3a
Continue with minor cleanup, and thread protection
zivkovicmilos Jul 25, 2022
12f591a
Simplify filter return
zivkovicmilos Jul 26, 2022
246f04e
Add close to the FM in tests
zivkovicmilos Jul 26, 2022
02813a7
Merge branch 'develop' into testBranch/validate_idea_for_removing_ws_…
zivkovicmilos Jul 26, 2022
397ee22
Resolve linting error, add parallel execution for tests
zivkovicmilos Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions jsonrpc/dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ func (d *Dispatcher) getFnHandler(req Request) (*serviceData, *funcData, Error)

type wsConn interface {
WriteMessage(messageType int, data []byte) error
GetFilterID() string
SetFilterID(string)
}

// as per https://www.jsonrpc.org/specification, the `id` in JSON-RPC 2.0
Expand Down Expand Up @@ -169,6 +171,10 @@ func (d *Dispatcher) handleUnsubscribe(req Request) (bool, Error) {
return d.filterManager.Uninstall(filterID), nil
}

func (d *Dispatcher) RemoveFilterByWs(conn wsConn) {
d.filterManager.RemoveFilterByWs(conn)
}

func (d *Dispatcher) HandleWs(reqBody []byte, conn wsConn) ([]byte, error) {
var req Request
if err := json.Unmarshal(reqBody, &req); err != nil {
Expand Down
8 changes: 2 additions & 6 deletions jsonrpc/eth_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,16 +809,12 @@ func (e *Eth) GetFilterChanges(id string) (interface{}, error) {

// UninstallFilter uninstalls a filter with given ID
func (e *Eth) UninstallFilter(id string) (bool, error) {
ok := e.filterManager.Uninstall(id)

return ok, nil
return e.filterManager.Uninstall(id), nil
}

// Unsubscribe uninstalls a filter in a websocket
func (e *Eth) Unsubscribe(id string) (bool, error) {
ok := e.filterManager.Uninstall(id)

return ok, nil
return e.filterManager.Uninstall(id), nil
}

func (e *Eth) getBlockHeader(number BlockNumber) (*types.Header, error) {
Expand Down
Loading