Use tendermint-rs branch

informalsystems · Apr 4, 2023 · dd44561 · dd44561
1 parent 7790eb4
commit dd44561
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,9 +17,9 @@ members = [
 
 [patch.crates-io]
 # ibc-proto                        = { git = "https://github.com/cosmos/ibc-proto-rs.git",       branch = "main" }
-tendermint                       = { path = "../tendermint-rs/tendermint" }
-tendermint-rpc                   = { path = "../tendermint-rs/rpc" }
-tendermint-proto                 = { path = "../tendermint-rs/proto" }
-tendermint-light-client          = { path = "../tendermint-rs/light-client" }
-tendermint-light-client-verifier = { path = "../tendermint-rs/light-client-verifier" }
-tendermint-testgen               = { path = "../tendermint-rs/testgen" }
+tendermint                       = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-rpc                   = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-proto                 = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-light-client          = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
+tendermint-testgen               = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "romac/new-misbehavior-detector" }
diff --git a/crates/relayer/src/light_client/tendermint.rs b/crates/relayer/src/light_client/tendermint.rs
@@ -5,8 +5,8 @@ use tracing::{debug, error, trace, warn};
 
 use tendermint_light_client::{
     components::{self, io::AtHeight},
+    detector::Divergence,
     light_client::LightClient as TmLightClient,
-    misbehavior::Divergence,
     state::State as LightClientState,
     store::{memory::MemoryStore, LightStore},
 };

diff --git a/crates/relayer/src/light_client/tendermint/detector.rs b/crates/relayer/src/light_client/tendermint/detector.rs
@@ -8,7 +8,7 @@ use tendermint::{
 use tendermint_light_client::{
     builder::LightClientBuilder,
     components::{clock::FixedClock, io::ProdIo, scheduler},
-    misbehavior::{detect_divergence, Divergence, Provider},
+    detector::{detect_divergence, Divergence, Provider},
     predicates::ProdPredicates,
     store::memory::MemoryStore,
     types::{LightBlock, PeerId},