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

feat: Integrate discovery and identify protocol #340

Merged
merged 18 commits into from
Mar 21, 2019

Conversation

TheWaWaR
Copy link
Contributor

@TheWaWaR TheWaWaR commented Mar 18, 2019

Changes

  • Add discovery protocol
  • Add identify protocol
  • Fix out bounded connect service
  • Fix can not shutdown network bug

Known issues

  • Shutdown network not very graceful.
  • Identify protocol is just workaround, will update in later PR.

@TheWaWaR TheWaWaR changed the title Integrate discovery protocol feat: Integrate discovery protocol Mar 18, 2019
@TheWaWaR TheWaWaR requested review from jjyr and quake March 18, 2019 05:15
network/src/protocol.rs Outdated Show resolved Hide resolved
network/src/service/discovery_service.rs Outdated Show resolved Hide resolved
network/src/service/discovery_service.rs Outdated Show resolved Hide resolved
network/src/service/discovery_service.rs Show resolved Hide resolved
network/src/service/discovery_service.rs Outdated Show resolved Hide resolved
@TheWaWaR TheWaWaR force-pushed the thewawar/integrate-discovery branch from e0c8cfb to 503e45a Compare March 19, 2019 03:01
@TheWaWaR TheWaWaR changed the title feat: Integrate discovery protocol feat: Integrate discovery/identify protocol Mar 19, 2019
@TheWaWaR TheWaWaR changed the title feat: Integrate discovery/identify protocol feat: Integrate discovery and identify protocol Mar 19, 2019
@TheWaWaR TheWaWaR force-pushed the thewawar/integrate-discovery branch 3 times, most recently from 73a3e79 to 834b815 Compare March 21, 2019 03:48
@TheWaWaR
Copy link
Contributor Author

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 21, 2019

👎 Rejected by code reviews

@zhangsoledad
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 21, 2019

Canceled

network/src/network.rs Outdated Show resolved Hide resolved
network/src/network.rs Outdated Show resolved Hide resolved
network/src/network_service.rs Show resolved Hide resolved
network/src/protocol.rs Outdated Show resolved Hide resolved
network/src/service/discovery_service.rs Outdated Show resolved Hide resolved
network/src/service/discovery_service.rs Show resolved Hide resolved
network/src/service/discovery_service.rs Show resolved Hide resolved
network/src/service/identify_service.rs Show resolved Hide resolved
network/src/service/identify_service.rs Show resolved Hide resolved
network/src/service/outbound_peer_service.rs Outdated Show resolved Hide resolved
@TheWaWaR TheWaWaR force-pushed the thewawar/integrate-discovery branch from 860425a to 3999aee Compare March 21, 2019 09:23
@jjyr
Copy link
Contributor

jjyr commented Mar 21, 2019

bors r+

bors bot added a commit that referenced this pull request Mar 21, 2019
340: feat: Integrate discovery and identify protocol r=jjyr a=TheWaWaR

## Changes
- [x] Add discovery protocol
- [x] Add identify protocol
- [x] Fix out bounded connect service
- [x] Fix can not shutdown network bug

## Known issues
- Shutdown network not very graceful.

Co-authored-by: Qian Linfeng <[email protected]>
Co-authored-by: Linfeng Qian <[email protected]>
@jjyr
Copy link
Contributor

jjyr commented Mar 21, 2019

There're still few problems in Identify protocol, should fix it after merge.

@bors bors bot merged commit 3999aee into develop Mar 21, 2019
@bors
Copy link
Contributor

bors bot commented Mar 21, 2019

Build succeeded

  • continuous-integration/travis-ci/push

@driftluo driftluo deleted the thewawar/integrate-discovery branch March 21, 2019 10:18
@doitian doitian mentioned this pull request Mar 27, 2019
bors bot added a commit that referenced this pull request Nov 6, 2019
1793: chore(deps): bump num_cpus from 1.10.1 to 1.11.0 r=doitian a=dependabot-preview[bot]

Bumps [num_cpus](https://github.com/seanmonstar/num_cpus) from 1.10.1 to 1.11.0.
<details>
<summary>Changelog</summary>

*Sourced from [num_cpus's changelog](https://github.com/seanmonstar/num_cpus/blob/master/CHANGELOG.md).*

> ## v1.11.0
> 
> #### Features
> 
> - add `hermit` target OS support
> - removes `bitrig` support
> 
> #### Fixes
> 
> - fix `get_physical` count with AMD hyperthreading.
</details>
<details>
<summary>Commits</summary>

- [`1904840`](seanmonstar/num_cpus@1904840) v1.11.0
- [`a8973cb`](seanmonstar/num_cpus@a8973cb) add support of the unikernel RustyHermit ([#88](https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/88))
- [`c3d2021`](seanmonstar/num_cpus@c3d2021) Refactor get_physical to sum 'cpu cores' per 'physical id' ([#86](https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/86))
- [`85d20df`](seanmonstar/num_cpus@85d20df) Avoid allocating a vector and double trimming in get_num_physical_cpus ([#87](https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/87))
- [`434d29c`](seanmonstar/num_cpus@434d29c) Use ptr::null_mut instead of 0 as *mut ([#84](https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/84))
- [`3a8994b`](seanmonstar/num_cpus@3a8994b) Remove bitrig support ([#78](https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/78))
- See full diff in [compare view](seanmonstar/num_cpus@v1.10.1...v1.11.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=num_cpus&package-manager=cargo&previous-version=1.10.1&new-version=1.11.0)](https://dependabot.com/compatibility-score.html?dependency-name=num_cpus&package-manager=cargo&previous-version=1.10.1&new-version=1.11.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

1794: chore(deps): bump toml from 0.5.2 to 0.5.5 r=doitian a=dependabot-preview[bot]

Bumps [toml](https://github.com/alexcrichton/toml-rs) from 0.5.2 to 0.5.5.
<details>
<summary>Commits</summary>

- [`7512904`](toml-rs/toml-rs@7512904) Bump to 0.5.5
- [`1e6bfbc`](toml-rs/toml-rs@1e6bfbc) replace copied wit filter_map for rustc 1.35 compatibility ([#354](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/354))
- [`4673cfd`](toml-rs/toml-rs@4673cfd) Replace the test added by [#349](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/349) with a bench ([#351](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/351))
- [`4b05a9d`](toml-rs/toml-rs@4b05a9d) update ([#352](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/352))
- [`189d2b9`](toml-rs/toml-rs@189d2b9) Bump to 0.5.4
- [`c049b7a`](toml-rs/toml-rs@c049b7a) Decrease deserialization complexity from quadratic to linear ([#349](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/349))
- [`ec21d60`](toml-rs/toml-rs@ec21d60) Support for dotted table spans ([#340](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/340))
- [`e9f5290`](toml-rs/toml-rs@e9f5290) Switch from linked-hash-map to indexmap
- [`8995cef`](toml-rs/toml-rs@8995cef) Spanned: impl PartialEq, Eq, Hash, PartialOrd, Ord in terms of the value ([#344](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/344))
- [`9ed2903`](toml-rs/toml-rs@9ed2903) Remove outdated Travis CI badge ([#346](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/346))
- Additional commits viewable in [compare view](toml-rs/toml-rs@0.5.2...0.5.5)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=toml&package-manager=cargo&previous-version=0.5.2&new-version=0.5.5)](https://dependabot.com/compatibility-score.html?dependency-name=toml&package-manager=cargo&previous-version=0.5.2&new-version=0.5.5)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
bors bot added a commit that referenced this pull request Dec 1, 2021
3208: chore: upgrade yamux r=doitian,TheWaWaR a=driftluo

### What problem does this PR solve?

In the default configuration, it has no effect, but we can enable the adjustment of window size after hardfork

```
## yamux 0.3.1-0.3.3 secio 0.5.1

yamux 0.3.2: edition 2018 
yamux 0.3.3 and 0.3.1: edition 2021

### Bug Fix

- Fix yamux window update(#340)
```

### Check List

Tests

- Unit test
- Integration test

### Release note

```release-note
None: Exclude this PR from the release note.
```



Co-authored-by: driftluo <[email protected]>
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.

3 participants