Merge pull request #803 from NordSecurity/LLT-5515-test-lana-failures

Fix incorrect entries in nat_traversal_conn_info
NordSecurity · Sep 3, 2024 · bc29f19 · bc29f19
2 parents 6279fc0 + ac0083b
commit bc29f19
Show file tree

Hide file tree

Showing 21 changed files with 378 additions and 306 deletions.
diff --git a/.unreleased/LLT-5515-fix-meshnet-connection-monitoring b/.unreleased/LLT-5515-fix-meshnet-connection-monitoring
@@ -0,0 +1 @@
+Fix incorrect entries in nat_traversal_conn_info
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -84,6 +84,7 @@ tokio = { workspace = true, features = ["test-util"] }
 
 telio-dns = { workspace = true, features = ["mockall"] }
 telio-firewall = { workspace = true, features = ["mockall"] }
+telio-nurse = { workspace = true, features = ["mockall"] }
 telio-proxy = { workspace = true, features = ["mockall"] }
 telio-batcher = { workspace = true }
 telio-pq = { workspace = true, features = ["mockall"] }
@@ -129,6 +130,7 @@ libc = "0.2.112"
 tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_debug"] }
 maplit = "1"
 mockall = "0.11.3"
+mockall_double = "0.3.1"
 modifier = "0.1.0"
 nat-detect = { git = "https://github.com/NordSecurity/nat-detect.git", tag = "v0.1.8" }
 ntest = "0.7"

diff --git a/crates/telio-nurse/Cargo.toml b/crates/telio-nurse/Cargo.toml
@@ -16,6 +16,7 @@ async-trait.workspace = true
 crypto_box.workspace = true
 futures.workspace = true
 mockall = { workspace = true, optional = true }
+mockall_double.workspace = true
 nat-detect.workspace = true
 rand.workspace = true
 serde.workspace = true
@@ -37,8 +38,6 @@ telio-utils.workspace = true
 telio-wg.workspace = true
 once_cell.workspace = true
 
-mockall_double = "0.3.1"
-
 [dev-dependencies]
 telio-sockets.workspace = true
 telio-wg = { workspace = true, features = ["mockall"] }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix incorrect entries in nat_traversal_conn_info