Skip to content
This repository has been archived by the owner. It is now read-only.

Merging in story 00 changes #123

Merged
merged 151 commits into from Sep 14, 2015
Merged

Merging in story 00 changes #123

merged 151 commits into from Sep 14, 2015

Conversation

@yaronyg
Copy link
Member

@yaronyg yaronyg commented Sep 14, 2015

Just bringing story 001 up to date

Review on Reviewable

Tobe and others added 30 commits Jul 24, 2015
Tidy up after intergrating async bridge

Split the descriptor out from networking impl.

Ditch a load of unused event code

Refactor Peer networking into manageable chunks

Checkpoint: Solve problem of atomic update of peers

Fix function I missed

Complete the refactor of PeerNetworking

Block scope doesn't work like thats

Deal with server/client being different kinds of peer

Fix up logging, invite timeout to 60 secs

Improved logging, fixed relays

Add protected mutable dict

Fix parms mismatch

Correct protected dict implementation

Add stop method to relays

Attempt to get server to notice client has gone
tobybrad and others added 26 commits Aug 28, 2015
The new version of the first test in thaliscenarios assumes that we should
get a networkChanged event when stopBroadcasting is called but that isn't
how the API is supposed to work. The code also depended on a race condition
where the call to startBroadcasting/stopBroadcasting and all their callbacks
where in a tight loop that would effectively allow them to run serially
even though they really should be in parallel.
# Conflicts:
#	thali/install/install.js
#	thali/install/setUpTests.sh
@yaronyg yaronyg added the in progress label Sep 14, 2015
yaronyg added a commit that referenced this pull request Sep 14, 2015
@yaronyg yaronyg merged commit e0dbbe6 into story_001 Sep 14, 2015
@yaronyg yaronyg removed the in progress label Sep 14, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants