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

Update libp2p version to fix cargo issue #136

Merged
merged 6 commits into from
Jan 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 21 additions & 18 deletions .github/workflows/ci-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- name: Toolchain setup
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- run: rustup component add rustfmt
- name: Run cargo fmt
uses: actions-rs/cargo@v1
Expand All @@ -56,7 +58,7 @@ jobs:
with:
path: ~/.cargo/registry
key: ${{ runner.os }}-cargo-registry-v0-${{ github.sha }}
restore-keys: ${{ runner.os }}-cargo-registry-v0-
restore-keys: ${{ runner.os }}-cargo-registry-v0-
- name: Cache cargo index
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -84,20 +86,21 @@ jobs:
args: -- -D warnings

publish_docs:
name: Publish Documentation
needs: [clippy, test]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update beta && rustup default beta
- name: Build documentation
run: cargo doc --no-deps --all-features
- name: Publish documentation
run: |
cd target/doc
git init
git add .
git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
name: Publish Documentation
needs: [clippy, test]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update beta && rustup default beta

- name: Build documentation
run: cargo doc --no-deps --all-features
- name: Publish documentation
run: |
cd target/doc
git init
git add .
git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
2 changes: 1 addition & 1 deletion blockchain/chain_sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2018"

[dependencies]
blocks = {path = "../blocks"}
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "3f9b030e29c9b31f9fe6f2ed27be4a813e2b3701" }
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "776d13ef046358964c7d64cda3295a3a3cb24743" }
4 changes: 1 addition & 3 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
network = { path = "network" }
ferret-libp2p = { path = "ferret-libp2p"}
utils = { path = "utils" }

libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "3f9b030e29c9b31f9fe6f2ed27be4a813e2b3701" }
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "776d13ef046358964c7d64cda3295a3a3cb24743" }
tokio = "0.1.22"
futures = "0.1.29"
clap = "2.33.0"
Expand Down
6 changes: 2 additions & 4 deletions node/ferret-libp2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "3f9b030e29c9b31f9fe6f2ed27be4a813e2b3701" }
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "776d13ef046358964c7d64cda3295a3a3cb24743" }
utils = { path = "../utils" }
tokio = "0.1.22"
futures = "0.1.29"
log = "0.4.8"
slog = "2.5.2"
serde = "1.0"
serde_derive = "1.0"
serde_derive = "1.0"
2 changes: 1 addition & 1 deletion node/ferret-libp2p/src/behaviour.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl<TSubstream: AsyncRead + AsyncWrite> NetworkBehaviourEventProcess<GossipsubE
for MyBehaviour<TSubstream>
{
fn inject_event(&mut self, message: GossipsubEvent) {
if let GossipsubEvent::Message(_, message) = message {
if let GossipsubEvent::Message(_, _, message) = message {
self.events.push(MyBehaviourEvent::GossipMessage {
source: message.source,
topics: message.topics,
Expand Down
6 changes: 2 additions & 4 deletions node/network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ferret-libp2p = { path = "../ferret-libp2p" }
futures = "0.1.29"
tokio = "0.1.22"
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "3f9b030e29c9b31f9fe6f2ed27be4a813e2b3701" }
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "776d13ef046358964c7d64cda3295a3a3cb24743" }
log = "0.4.8"
slog = "2.5.2"
slog = "2.5.2"