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.

Sign up for GitHub

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

Jump to bottom

Fix clippy #83

Merged
merged 35 commits into from
Apr 24, 2024
Merged

Fix clippy #83

merged 35 commits into from
Apr 24, 2024

Conversation

lexnv
Copy link
Collaborator

@lexnv lexnv commented Apr 22, 2024

Builds on #57, however due to the high number of conflicts I fixed the errors in this PR.

Next Steps

  • Sync node with this PR

lexnv added 30 commits April 19, 2024 18:13
@lexnv
Apply easy clippy --fix
b48b266 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
Manual clippy fix v1
4de23fb 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
Allow clippy::single_match
3b62ac5 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: needless return
b8759aa 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: needless borrow
6fca218 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: needless lifetime
9d05c38 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: needless question mark
c602692 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: large_enum_variant
f29ca90 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: new_without_default
9db7302 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: redundant_closure
d98e157 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: needless into
838589b 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: let_unit_value
78ec193 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: for_kv_map
beb879c 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: map_flatten
c321813 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: blocks_in_conditions
49695b7 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: derived_hash_with_manual_eq
14123fa 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
allow: redundant_pattern_matching
64fb8a4 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: derivable_impls
bf403d5 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: identity_op
92f4e40 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: mem_replace_with_default
9c805df 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
allow: type_complexity
fa43cdb 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: get_first
4e60e55 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: to_string_in_format_args
0edeb56 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: op_ref
b117b16 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: derive imp again
0d86588 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: while_let_on_iterator
6a02c99 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: iter_kv_map
fb46a29 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
allow: result_unit_err
69e0c44 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: don't bind tokio::spawn
739ef23 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
allow: should_implement_trait
d5badf9 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: clone_on_copy
0d18112 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: impl from over into
6423ed2 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
fix: remaining clippy
af99ff9 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
ci: Fail on clippy error
f1e2b13 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
Apply rustfmt
5c37774 
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv
Copy link
Collaborator Author

lexnv commented Apr 22, 2024

For testing, I've left this PR + #61 running a full Kusama node with:

  • normal sync
  • warp sync

dmitry-markin
dmitry-markin approved these changes Apr 22, 2024
View reviewed changes
Copy link
Collaborator

@dmitry-markin dmitry-markin left a comment

Choose a reason for hiding this comment

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

LGTM!

src/lib.rs
Comment on lines +21 to +29
#![allow(clippy::single_match)]
#![allow(clippy::result_large_err)]
#![allow(clippy::redundant_pattern_matching)]
#![allow(clippy::type_complexity)]
#![allow(clippy::result_unit_err)]
#![allow(clippy::should_implement_trait)]
#![allow(clippy::too_many_arguments)]
#![allow(clippy::assign_op_pattern)]
#![allow(clippy::match_like_matches_macro)]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we revisit this later?

@lexnv lexnv mentioned this pull request Apr 23, 2024
Merged
lexnv added a commit that referenced this pull request Apr 23, 2024
@lexnv
crypto: Don't panic on unsupported key types (#84)
6e11e7c 
This PR ensures that litep2p does not panic when decoding public keys
from received TCP noise handshake.

The code operated under the assumption that only the `ed25519` key is
valid in the context of Substrate.
However, peers could still use a different key (`rsa` / `ecdsa`) and
cause the code to panic.
In those cases, an error is returned which terminates the negotiation
handshake.

Discovered during testing a sync node with litep2p backend on kusama as
part of #83.

```bash

Version: 1.10.0-cd9d08d6311

   0: sp_panic_handler::set::{{closure}}
   1: std::panicking::rust_panic_with_hook
   2: std::panicking::begin_panic_handler::{{closure}}
   3: std::sys_common::backtrace::__rust_end_short_backtrace
   4: rust_begin_unwind
   5: core::panicking::panic_fmt
   6: <litep2p::crypto::PublicKey as core::convert::TryFrom<litep2p::crypto::keys_proto::PublicKey>>::try_from
   7: litep2p::crypto::PublicKey::from_protobuf_encoding
   8: litep2p::crypto::noise::parse_peer_id
   9: litep2p::transport::tcp::connection::TcpConnection::negotiate_connection::{{closure}}
  10: <tokio::time::timeout::Timeout<T> as core::future::future::Future>::poll
  11: <litep2p::transport::tcp::TcpTransport as litep2p::transport::Transport>::negotiate::{{closure}}
  12: <futures_util::stream::futures_unordered::FuturesUnordered<Fut> as futures_core::stream::Stream>::poll_next
  13: <litep2p::transport::tcp::TcpTransport as futures_core::stream::Stream>::poll_next
  14: <litep2p::transport::manager::TransportContext as futures_core::stream::Stream>::poll_next
  15: litep2p::transport::manager::TransportManager::next::{{closure}}
  16: <tokio::future::poll_fn::PollFn<F> as core::future::future::Future>::poll
  17: <sc_network::litep2p::Litep2pNetworkBackend as sc_network::service::traits::NetworkBackend<B,H>>::run::{{closure}}
  18: sc_service::build_network_future::{{closure}}::{{closure}}::{{closure}}
  19: <futures_util::future::poll_fn::PollFn<F> as core::future::future::Future>::poll
  20: <sc_service::task_manager::prometheus_future::PrometheusFuture<T> as core::future::future::Future>::poll
  21: <futures_util::future::select::Select<A,B> as core::future::future::Future>::poll
  22: <tracing_futures::Instrumented<T> as core::future::future::Future>::poll
  23: tokio::runtime::park::CachedParkThread::block_on
  24: tokio::runtime::context::runtime::enter_runtime
  25: <tokio::runtime::blocking::task::BlockingTask<T> as core::future::future::Future>::poll
  26: tokio::runtime::task::core::Core<T,S>::poll
  27: tokio::runtime::task::harness::Harness<T,S>::poll
  28: tokio::runtime::blocking::pool::Inner::run
  29: std::sys_common::backtrace::__rust_begin_short_backtrace
  30: core::ops::function::FnOnce::call_once{{vtable.shim}}
  31: std::sys::pal::unix::thread::Thread::new::thread_start
  32: <unknown>
  33: <unknown>


Thread 'tokio-runtime-worker' panicked at 'not implemented: unsupported key type', /home/ubuntu/.cargo/git/checkouts/litep2p-2515ad90543f141a/153d388/src/crypto/mod.rs:103
```

cc @dmitry-markin

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
@lexnv lexnv mentioned this pull request Apr 24, 2024
Open
@lexnv
Copy link
Collaborator Author

lexnv commented Apr 24, 2024

Testing Results

The warp-sync node is producing blocks, running for roughly ~20h.

WARN tokio-runtime-worker telemetry: ❌ Error while dialing /dns/telemetry.polkadot.io/tcp/443/x-parity-wss/%2Fsubmit%2F: Custom { kind: Other, error: Timeout }

WARN tokio-runtime-worker litep2p::ipfs::identify: inbound identify substream opened for peer who doesn't exist peer=PeerId("12D3KooWF3PWbXdGEuT35nBh3MgECtxnHng3s5c5QKapoDZMy38z") protocol=/ipfs/id/1.0.0
WARN tokio-runtime-worker litep2p::ipfs::identify: inbound identify substream opened for peer who doesn't exist peer=PeerId("12D3KooWF3PWbXdGEuT35nBh3MgECtxnHng3s5c5QKapoDZMy38z") protocol=/ipfs/id/1.0.0

WARN tokio-runtime-worker sync: 💔 Ignored block (#22873601 -- 0x649e…eab2) announcement from 12D3KooWBDbBuoE4umuzJnZcUouT4GY6n31BRWHXdAFsThjTKrug because all validation slots for this peer are occupied.
WARN tokio-runtime-worker sync: 💔 Ignored block (#22873781 -- 0xf711…b203) announcement from 12D3KooWBDbBuoE4umuzJnZcUouT4GY6n31BRWHXdAFsThjTKrug because all validation slots for this peer are occupied.
WARN tokio-runtime-worker sync: 💔 Ignored block (#22873782 -- 0x917b…dfa0) announcement from 12D3KooWBDbBuoE4umuzJnZcUouT4GY6n31BRWHXdAFsThjTKrug because all validation slots for this peer are occupied.

WARN tokio-runtime-worker db::notification_pinning: Notification block pinning limit reached. Unpinning block with hash

ERROR tokio-runtime-worker beefy: 🥩 Error: ConsensusReset. Restarting voter.

I think we are good to go here. I'll wait for a few more hours and if everything looks sane, I'll merge this and #61.

I'll leave the full node running for a few more days.

@lexnv lexnv merged commit 19515ea into master Apr 24, 2024
7 checks passed
@lexnv lexnv deleted the lexnv/fix-clippy-v1 branch April 24, 2024 10:47
@lexnv lexnv mentioned this pull request May 24, 2024
Merged
lexnv added a commit that referenced this pull request May 24, 2024
@lexnv
chore: Release v0.5.0 (#118)
0364bf5 
## [0.5.0] - 2023-05-24

This is a small patch release that makes the `FindNode` command a bit
more robst:

- The `FindNode` command now retains the K (replication factor) best
results.
- The `FindNode` command has been updated to handle errors and
unexpected states without panicking.

### Changed

- kad: Refactor FindNode query, keep K best results and add tests
([#114](#114))

## [0.4.0] - 2023-05-23

This release introduces breaking changes to the litep2p crate, primarily
affecting the `kad` module. Key updates include:

- The `GetRecord` command now exposes all peer records, not just the
latest one.
- A new `RecordType` has been introduced to clearly distinguish between
locally stored records and those discovered from the network.

Significant refactoring has been done to enhance the efficiency and
accuracy of the `kad` module. The updates are as follows:

- The `GetRecord` command now exposes all peer records.
- The `GetRecord` command has been updated to handle errors and
unexpected states without panicking.

Additionally, we've improved code coverage in the `kad` module by adding
more tests.

### Added

- Add release checklist
([#115](#115))
- Re-export `multihash` & `multiaddr` types
([#79](#79))
- kad: Expose all peer records of `GET_VALUE` query
([#96](#96))

### Changed

- multistream_select: Remove unneeded changelog.md
([#116](#116))
- kad: Refactor `GetRecord` query and add tests
([#97](#97))
- kad/store: Set memory-store on an incoming record for PutRecordTo
([#88](#88))
- multistream: Dialer deny multiple /multistream/1.0.0 headers
([#61](#61))
- kad: Limit MemoryStore entries
([#78](#78))
- Refactor WebRTC code
([#51](#51))
- Revert "Bring `rustfmt.toml` in sync with polkadot-sdk (#71)"
([#74](#74))
- cargo: Update str0m from 0.4.1 to 0.5.1
([#95](#95))

### Fixed

- Fix clippy  ([#83](#83))
- crypto: Don't panic on unsupported key types
([#84](#84))

---------

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmitry-markin dmitry-markin dmitry-markin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lexnv @dmitry-markin