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.

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

Feature/makesomenoise #37

Merged
merged 204 commits into from
Nov 13, 2019
Merged

Feature/makesomenoise #37

merged 204 commits into from
Nov 13, 2019

Conversation

shahankhatch
Copy link
Contributor

PR for #35

Nashatyrev and others added 30 commits July 5, 2019 14:36
…x close/reset. Close == disconnect(), Reset == close()
…ature/mplex

# Conflicts:
#	src/test/kotlin/io/libp2p/core/security/secio/NetworkTest.kt
WIP: mplex implementation.
Resolve #16
Copy link
Collaborator

@Nashatyrev Nashatyrev left a comment

Choose a reason for hiding this comment

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

I addressed all my comments in a separate PR: #48

Copy link
Collaborator

@Nashatyrev Nashatyrev left a comment

Choose a reason for hiding this comment

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

Could you please rebase PR to the develop branch?

…kesomenoise

# Conflicts:
#	build.gradle.kts
#	src/main/kotlin/io/libp2p/core/multiformats/Protocol.kt
#	src/main/kotlin/io/libp2p/host/HostImpl.kt
#	src/main/kotlin/io/libp2p/host/MemoryAddressBook.kt
#	src/main/kotlin/io/libp2p/network/NetworkImpl.kt
#	src/main/kotlin/io/libp2p/transport/tcp/TcpTransport.kt
#	src/test/java/io/libp2p/tools/p2pd/P2PDDht.java
#	src/test/java/io/libp2p/tools/p2pd/P2PDHost.java
#	src/test/java/io/libp2p/tools/p2pd/libp2pj/DHT.java
#	src/test/java/io/libp2p/tools/p2pd/libp2pj/Host.java
#	src/test/java/io/libp2p/tools/p2pd/libp2pj/PeerInfo.java
#	src/test/java/io/libp2p/tools/p2pd/libp2pj/Transport.java
#	src/test/kotlin/io/libp2p/core/HostTest.kt
#	src/test/kotlin/io/libp2p/core/RpcHandlerTest.kt
#	src/test/kotlin/io/libp2p/pubsub/GoInteropTest.kt
#	src/test/kotlin/io/libp2p/pubsub/PubsubRouterTest.kt
#	src/test/kotlin/io/libp2p/security/secio/EchoSampleTest.kt
#	src/test/kotlin/io/libp2p/security/secio/SecIoSecureChannelTest.kt
#	src/test/kotlin/io/libp2p/security/secio/SecioHandshakeTest.kt
#	src/test/kotlin/io/libp2p/transport/tcp/TcpTransportTest.kt
@shahankhatch shahankhatch changed the base branch from feature/cleanup to develop October 22, 2019 04:14
@Nashatyrev
Copy link
Collaborator

@shahankhatch thanks for addressing my comments 👍
I'd also made some minor code cleanups

@Nashatyrev Nashatyrev merged commit 94d1d4b into develop Nov 13, 2019
@Nashatyrev Nashatyrev deleted the feature/makesomenoise branch November 15, 2019 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants