Merge pull request #3731 from stacks-network/chore/rstest-improvements

Chore: rstest improvements
stacks-network · Jun 13, 2023 · 02dabb8 · 02dabb8
2 parents a04f364 + 85d9639
commit 02dabb8
Show file tree

Hide file tree

Showing 27 changed files with 871 additions and 879 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -91,14 +91,14 @@ version = "0.2.23"
 features = ["std"]
 
 [dev-dependencies]
-rstest = "0.11.0"
-rstest_reuse = "0.1.3"
 assert-json-diff = "1.0.0"
 criterion = "0.3.5"
 stdext = "0.3.1"
 stx_genesis = { package = "stx-genesis", path = "./stx-genesis/."}
 clarity = { package = "clarity", features = ["default", "testing"], path = "./clarity/." }
 stacks_common = { package = "stacks-common", features = ["default", "testing"], path = "./stacks-common/." }
+rstest = "0.17.0"
+rstest_reuse = "0.5.0"
 
 [features]
 default = ["developer-mode"]

diff --git a/clarity/Cargo.toml b/clarity/Cargo.toml
@@ -28,8 +28,8 @@ lazy_static = "1.4.0"
 integer-sqrt = "0.1.3"
 slog = { version = "2.5.2", features = [ "max_level_trace" ] }
 stacks_common = { package = "stacks-common", path = "../stacks-common/." }
-rstest = "0.11.0"
-rstest_reuse = "0.1.3"
+rstest = "0.17.0"
+rstest_reuse = "0.5.0"
 
 [dependencies.serde_json]
 version = "1.0"
@@ -44,8 +44,6 @@ version = "0.2.23"
 features = ["std"]
 
 [dev-dependencies]
-rstest = "0.11.0"
-rstest_reuse = "0.1.3"
 assert-json-diff = "1.0.0"
 # a nightly rustc regression (35dbef235 2021-03-02) prevents criterion from compiling
 #  but it isn't necessary for tests: only benchmarks. therefore, commenting out for now.

diff --git a/clarity/src/libclarity.rs b/clarity/src/libclarity.rs
@@ -49,7 +49,7 @@ extern crate rstest;
 
 #[cfg(any(test, feature = "testing"))]
 #[macro_use]
-extern crate rstest_reuse;
+pub extern crate rstest_reuse;
 
 #[cfg(feature = "monitoring_prom")]
 #[macro_use]