Skip to content

Commit

Permalink
Merge branch 'master' into feat/perf-remove-keep-until
Browse files Browse the repository at this point in the history
  • Loading branch information
leonzchang authored Oct 16, 2023
2 parents b77234f + 29c44e8 commit 9d652b9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ jobs:
with:
save-if: ${{ github.ref == 'refs/heads/master' }}

- name: Run cargo clippy
run: cargo clippy
- run: cargo clippy --all-targets --all-features

ipfs-integration-test:
name: IPFS Integration tests
Expand Down
6 changes: 6 additions & 0 deletions protocols/kad/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

[PR 4547]: https://github.com/libp2p/rust-libp2p/pull/4547

<!-- Internal changes:
- Fix lints in tests
-->

## 0.44.5
- Migrate to `quick-protobuf-codec` crate for codec logic.
See [PR 4501].
Expand Down
6 changes: 3 additions & 3 deletions protocols/kad/src/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1224,14 +1224,14 @@ mod tests {

match current {
None => {
assert_eq!(new.reported, false);
assert!(!new.reported);
assert_eq!(new.supported, now_supported);
}
Some(current) => {
if current.supported == now_supported {
assert_eq!(new.reported, true);
assert!(new.reported);
} else {
assert_eq!(new.reported, false);
assert!(!new.reported);
}

assert_eq!(new.supported, now_supported);
Expand Down

0 comments on commit 9d652b9

Please sign in to comment.