Skip to content

Commit 91e1042

Browse files
committed
Make IAsyncConnection.StateChanged non-explicit in ConnectionStateTracker
1 parent 304677f commit 91e1042

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

Net.SocketIO/ConnectionStateTracker.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void Disconnect()
8080
private readonly Lock _currStateLock = new();
8181
private ConnectionStates _currState = ConnectionStates.Disconnected;
8282

83-
private event Func<ConnectionStates, CancellationToken, ValueTask> _stateChanged;
8483
#pragma warning disable CS0618 // Type or member is obsolete
8584
private event Action<ConnectionStates> _syncStateChanged;
8685

@@ -93,11 +92,7 @@ event Action<ConnectionStates> IConnection.StateChanged
9392
#pragma warning restore CS0618
9493

9594
/// <inheritdoc />
96-
event Func<ConnectionStates, CancellationToken, ValueTask> IAsyncConnection.StateChanged
97-
{
98-
add => _stateChanged += value;
99-
remove => _stateChanged -= value;
100-
}
95+
public event Func<ConnectionStates, CancellationToken, ValueTask> StateChanged;
10196

10297
/// <summary>
10398
/// Connects all tracked connections asynchronously.
@@ -226,7 +221,7 @@ private async ValueTask UpdateOverallStateAsync(CancellationToken cancellationTo
226221

227222
_syncStateChanged?.Invoke(newState);
228223

229-
if (_stateChanged is { } handler)
224+
if (StateChanged is { } handler)
230225
await handler(newState, cancellationToken);
231226
}
232227
}

Tests/Net/ConnectionStateTrackerTests.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -921,9 +921,6 @@ public async Task ConnectAsync_CancellationRequested_PropagatesToken()
921921
// Connection might still be called before cancellation
922922
}
923923

924-
private static void SubscribeAsync(ConnectionStateTracker tracker, Func<ConnectionStates, CancellationToken, ValueTask> handler)
925-
=> ((IAsyncConnection)tracker).StateChanged += handler;
926-
927924
[TestMethod]
928925
public void AsyncStateChanged_AllConnected_Fires()
929926
{
@@ -935,7 +932,7 @@ public void AsyncStateChanged_AllConnected_Fires()
935932
tracker.Add(conn2);
936933

937934
ConnectionStates? firedState = null;
938-
SubscribeAsync(tracker, (state, _) => { firedState = state; return default; });
935+
tracker.StateChanged += (state, _) => { firedState = state; return default; };
939936

940937
conn1.SetState(ConnectionStates.Connected);
941938
conn2.SetState(ConnectionStates.Connected);
@@ -954,7 +951,7 @@ public void AsyncStateChanged_TransitionSequence()
954951
tracker.Add(conn2);
955952

956953
var states = new List<ConnectionStates>();
957-
SubscribeAsync(tracker, (state, _) => { states.Add(state); return default; });
954+
tracker.StateChanged += (state, _) => { states.Add(state); return default; };
958955

959956
conn1.SetState(ConnectionStates.Connected);
960957
conn2.SetState(ConnectionStates.Connected);
@@ -991,7 +988,7 @@ public void AsyncStateChanged_BothSyncAndAsyncFire()
991988
ConnectionStates? asyncState = null;
992989

993990
Subscribe(tracker, state => syncState = state);
994-
SubscribeAsync(tracker, (state, _) => { asyncState = state; return default; });
991+
tracker.StateChanged += (state, _) => { asyncState = state; return default; };
995992

996993
conn.SetState(ConnectionStates.Connected);
997994

0 commit comments

Comments
 (0)