Resolve conflicts with master

Signed-off-by: Thane Thomson <connect@thanethomson.com>

.changelog/unreleased/improvements/814-clonable-secret-conn.md

@@ -0,0 +1,4 @@
+- `[tendermint-p2p]` The `SecretConnection` can now be split into two halves to
+  facilitate full-duplex communication (must be facilitated by using each half
+  in a separate thread).
+  ([#938](https://github.com/informalsystems/tendermint-rs/pull/938))

Cargo.toml

@@ -8,6 +8,7 @@ members = [
     "pbt-gen",
     "proto",
     "rpc",
+    "std-ext",
     "tendermint",
     "test",
     "testgen"

light-client/src/components/verifier.rs

@@ -119,8 +119,8 @@ impl Verifier for ProdVerifier {
             &*self.voting_power_calculator,
             &*self.commit_validator,
             &*self.hasher,
-            &trusted,
-            &untrusted,
+            trusted,
+            untrusted,
             options,
             now,
         )

light-client/src/macros.rs

@@ -4,7 +4,7 @@
 #[macro_export]
 macro_rules! bail {
     ($kind:expr) => {
-        return Err($kind.into());
+        return Err($kind.into())
     };
 }
 

light-client/src/peer_list.rs

@@ -111,7 +111,7 @@ impl<T> PeerList<T> {
     /// - The given peer id must not be the primary peer id.
     /// - The given peer must be in the witness list
     #[pre(faulty_witness != self.primary && self.witnesses.contains(&faulty_witness))]
-    #[post(Self::invariant(&self))]
+    #[post(Self::invariant(self))]
     pub fn replace_faulty_witness(&mut self, faulty_witness: PeerId) -> Option<PeerId> {
         let mut result = None;
 
@@ -133,7 +133,7 @@ impl<T> PeerList<T> {
     ///
     /// ## Errors
     /// - If there are no witness left, returns `ErrorKind::NoWitnessLeft`.
-    #[post(ret.is_ok() ==> Self::invariant(&self))]
+    #[post(ret.is_ok() ==> Self::invariant(self))]
     pub fn replace_faulty_primary(
         &mut self,
         primary_error: Option<Error>,

light-client/src/predicates.rs

@@ -233,10 +233,10 @@ pub fn verify(
     vp.is_header_from_past(&untrusted.signed_header.header, options.clock_drift, now)?;
 
     // Ensure the header validator hashes match the given validators
-    vp.validator_sets_match(&untrusted, &*hasher)?;
+    vp.validator_sets_match(untrusted, &*hasher)?;
 
     // Ensure the header next validator hashes match the given next validators
-    vp.next_validators_match(&untrusted, &*hasher)?;
+    vp.next_validators_match(untrusted, &*hasher)?;
 
     // Ensure the header matches the commit
     vp.header_matches_commit(&untrusted.signed_header, hasher)?;
@@ -259,7 +259,7 @@ pub fn verify(
     if untrusted.height() == trusted_next_height {
         // If the untrusted block is the very next block after the trusted block,
         // check that their (next) validator sets hashes match.
-        vp.valid_next_validator_set(&untrusted, trusted)?;
+        vp.valid_next_validator_set(untrusted, trusted)?;
     } else {
         // Otherwise, ensure that the untrusted block has a greater height than
         // the trusted block.

light-client/src/store/memory.rs

@@ -81,6 +81,7 @@ impl LightStore for MemoryStore {
             .map(|(_, e)| e.light_block.clone())
     }
 
+    #[allow(clippy::needless_collect)]
     fn all(&self, status: Status) -> Box<dyn Iterator<Item = LightBlock>> {
         let light_blocks: Vec<_> = self
             .store

light-client/src/supervisor.rs

@@ -319,7 +319,7 @@ impl Supervisor {
             .collect();
 
         self.fork_detector
-            .detect_forks(verified_block, &trusted_block, witnesses)
+            .detect_forks(verified_block, trusted_block, witnesses)
     }
 
     /// Run the supervisor event loop in the same thread.

p2p/Cargo.toml

@@ -50,6 +50,7 @@ flex-error = { version = "0.4.1", default-features = false }
 # path dependencies
 tendermint = { path = "../tendermint", version = "0.21.0" }
 tendermint-proto = { path = "../proto", version = "0.21.0" }
+tendermint-std-ext = { path = "../std-ext", version = "0.21.0" }
 
 # optional dependencies
 prost-amino = { version = "0.6", optional = true }

p2p/src/error.rs

@@ -63,5 +63,15 @@ define_error! {
         SmallOutputBuffer
             | _ | { "output buffer is too small" },
 
+        TransportClone
+            { detail: String }
+            | e | { format_args!("failed to clone underlying transport: {}", e.detail) }
+
+    }
+}
+
+impl From<std::io::Error> for Error {
+    fn from(e: std::io::Error) -> Self {
+        Self::io(e)
     }
 }