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

Minor nits on pubsub implementation #1593

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Minor nits on pubsub implementation #1593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ec3df
Minor nits on pubsub implementation
aaronbuchwald Sep 27, 2024
cb13a29
Merge branch 'main' into pubsub-nits
joshua-kim Sep 30, 2024
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
14 changes: 9 additions & 5 deletions api/ws/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,12 @@ func (w *WebSocketServer) AddTxListener(tx *chain.Transaction, c *pubsub.Connect

// TODO: limit max number of tx listeners a single connection can create
txID := tx.ID()
if _, ok := w.txListeners[txID]; !ok {
w.txListeners[txID] = pubsub.NewConnections()
connections, ok := w.txListeners[txID]
if !ok {
connections = pubsub.NewConnections()
w.txListeners[txID] = connections
}
w.txListeners[txID].Add(c)
connections.Add(c)
w.expiringTxs.Add([]*chain.Transaction{tx})
}

Expand Down Expand Up @@ -219,7 +221,9 @@ func (w *WebSocketServer) AcceptBlock(b *chain.StatefulBlock) error {
if err != nil {
return err
}
w.s.Publish(append([]byte{TxMode}, bytes...), listeners)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really not a fan of not using the blank return for errors in the old code... feels like it makes it non-obvious that we're ignoring error values.

// Skip clearing inactive connections because they'll be deleted
// regardless.
_ = w.s.Publish(append([]byte{TxMode}, bytes...), listeners)
delete(w.txListeners, txID)
// [expiringTxs] will be cleared eventually (does not support removal)
}
Expand Down Expand Up @@ -274,7 +278,7 @@ func (w *WebSocketServer) MessageCallback() pubsub.Callback {
}
w.AddTxListener(tx, c)

// Submit will remove from [txWaiters] if it is not added
// Submit will remove from [txListeners] if it is not added
txID := tx.ID()
if err := w.vm.Submit(ctx, false, []*chain.Transaction{tx})[0]; err != nil {
w.logger.Error("failed to submit tx",
Expand Down
2 changes: 1 addition & 1 deletion pubsub/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type Server struct {
conns *Connections
}

// New returns a new Server instance. The callback function [f] is called
// New returns a new Server instance. [callback] is called
// by the server in response to messages if not nil.
func New(
log logging.Logger,
Expand Down
4 changes: 0 additions & 4 deletions pubsub/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ func (x *counter) dummyProcessTXCallback(b []byte, _ *Connection) {
// a msg to be sent to all connections. Checks the message was delivered properly
// and the connection is properly handled when closed.
func TestServerPublish(t *testing.T) {
t.Skip("FLAKY")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing FLAKY here in favor of seeing and fixing the test failures, since this is causing problems


require := require.New(t)
// Create a new logger for the test
logger := logging.NoLog{}
Expand Down Expand Up @@ -194,8 +192,6 @@ func TestServerRead(t *testing.T) {
// a msg to be sent to only one of the connections. Checks the message was
// delivered properly and the connection is properly handled when closed.
func TestServerPublishSpecific(t *testing.T) {
t.Skip("FLAKY")

require := require.New(t)
// Create a new logger for the test
logger := logging.NoLog{}
Expand Down
Loading