diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml index 94f15783d4cd..00f8f93c168c 100644 --- a/.github/workflows/ci-rust.yml +++ b/.github/workflows/ci-rust.yml @@ -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 @@ -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: @@ -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 diff --git a/blockchain/chain_sync/Cargo.toml b/blockchain/chain_sync/Cargo.toml index a4b0bed46d33..a39909d28de8 100644 --- a/blockchain/chain_sync/Cargo.toml +++ b/blockchain/chain_sync/Cargo.toml @@ -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" } diff --git a/node/Cargo.toml b/node/Cargo.toml index 9abdfd8a456e..075d9f83f44c 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -4,14 +4,12 @@ version = "0.1.0" authors = ["ChainSafe Systems "] 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" diff --git a/node/ferret-libp2p/Cargo.toml b/node/ferret-libp2p/Cargo.toml index 1bfa77c563cf..28b6287a6495 100644 --- a/node/ferret-libp2p/Cargo.toml +++ b/node/ferret-libp2p/Cargo.toml @@ -4,14 +4,12 @@ version = "0.1.0" authors = ["ChainSafe Systems "] 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" \ No newline at end of file +serde_derive = "1.0" diff --git a/node/ferret-libp2p/src/behaviour.rs b/node/ferret-libp2p/src/behaviour.rs index c253268b6772..20fd0e03d73a 100644 --- a/node/ferret-libp2p/src/behaviour.rs +++ b/node/ferret-libp2p/src/behaviour.rs @@ -61,7 +61,7 @@ impl NetworkBehaviourEventProcess { 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, diff --git a/node/network/Cargo.toml b/node/network/Cargo.toml index 57e2ebf9140d..c80c486565e3 100644 --- a/node/network/Cargo.toml +++ b/node/network/Cargo.toml @@ -4,12 +4,10 @@ version = "0.1.0" authors = ["ChainSafe Systems "] 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" \ No newline at end of file +slog = "2.5.2"