Merge master into discv5.2
#234
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* reject extra data * reduce diff
* Replace `Handler::spawn` with `build_handler()` and `Handler::start()` * Test the handler's states after the handler has been terminated * Remove expected response on handle_auth_message() * Rename variables for readability
* Change `port` from u16 to NonZeroU16 * Fix tests * Fix test: the PONG port can't be zero * Fix clippy warnings
Co-authored-by: ackintosh <[email protected]> Co-authored-by: Diva M <[email protected]> Co-authored-by: Age Manning <[email protected]>
* remove log for timed out query. This is always informed in the callback * expand common logs, unify info on startup * adjust auth header log * Update src/service.rs * Appease clippy * Realised I was wrong. Don't need this log, my bad * fmt --------- Co-authored-by: Age Manning <[email protected]>
# Conflicts: # Cargo.toml # src/config.rs # src/error.rs # src/handler/mod.rs # src/handler/session.rs # src/handler/tests.rs # src/rpc.rs # src/service.rs # src/service/test.rs
since the argument of LruCache::new is NonZeroUsize.
emhane
approved these changes
Feb 17, 2024
| enable_packet_filter: false, | ||
| request_timeout: Duration::from_secs(1), | ||
| vote_duration: Duration::from_secs(30), | ||
| query_peer_timeout: Duration::from_secs(2), | ||
| query_timeout: Duration::from_secs(60), | ||
| request_retries: 1, | ||
| session_timeout: Duration::from_secs(86400), | ||
| session_cache_capacity: 1000, | ||
| session_cache_capacity: NonZeroUsize::new(1000).expect("infallible"), |
There was a problem hiding this comment.
appropriate. always wondering what message to write when calling expect on this with a value > 0.
|
|
||
| pub(super) struct ActiveRequests { | ||
| /// A list of raw messages we are awaiting a response from the remote. | ||
| active_requests_mapping: HashMapDelay<NodeAddress, RequestCall>, | ||
| active_requests_mapping: HashMap<NodeAddress, Vec<RequestCall>>, |
Comment on lines
+230
to
+232
| // Seed is chosen such that all nodes are in the 256th distance of the first node. | ||
| let seed = 1652; | ||
| let mut keypairs = generate_deterministic_keypair(5, seed); |
There was a problem hiding this comment.
very useful, didn't know this function was available
Comment on lines
+1516
to
+1518
| let received = nodes_response.received_nodes.len(); | ||
| let expected = distances.len(); | ||
| warn!(%node_id, %addr, %error, %received, %expected, "FINDNODE request failed with partial results"); |
There was a problem hiding this comment.
isn't this wording a bit misleading? distances and nodes don't map 1-1. we can receive more than one node in the response at any distance in the requested range of distances.
Suggested change
| let received = nodes_response.received_nodes.len(); | |
| let expected = distances.len(); | |
| warn!(%node_id, %addr, %error, %received, %expected, "FINDNODE request failed with partial results"); | |
| let received = nodes_response.received_nodes.len(); | |
| warn!(%node_id, %addr, %error, %received, ?distances, "FINDNODE request failed with partial results"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merge lastest
masterbranch intodiscv5.2.Notes & open questions
I have updated the
Config::session_cache_capacitytype from usize to NonZeroUsize in 6d4fce2, for the following reasons:Config::session_cache_capacityis utilized in Handler's session (LruTimeCache) and inNat::new_peer_latest_relay_cache(LruCache).Nat::new_peer_latest_relay_cacheis LruCache and the argument forLruCache::newis NonZeroUsizeChange checklist