fix: node_version() for x.x.x-rc.x (#728)

* fix: node_version() for x.x.x-rc.x
near · Jul 24, 2024 · b1677a5 · b1677a5
1 parent c6ee633
commit b1677a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/chain-signatures/Cargo.lock b/chain-signatures/Cargo.lock
diff --git a/chain-signatures/node/Cargo.toml b/chain-signatures/node/Cargo.toml
@@ -31,6 +31,7 @@ k256 = { version = "0.13.1", features = ["sha256", "ecdsa", "serde"] }
 local-ip-address = "0.5.4"
 rand = "0.8"
 reqwest = { version = "0.11.16", features = ["blocking", "json"] }
+semver = "1.0.23"
 sha2 = "0.10.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

diff --git a/chain-signatures/node/src/protocol/mod.rs b/chain-signatures/node/src/protocol/mod.rs
@@ -350,8 +350,6 @@ async fn get_my_participant(protocol: &MpcSignProtocol) -> Participant {
 }
 
 fn node_version() -> i64 {
-    env!("CARGO_PKG_VERSION")
-        .split('.')
-        .map(|s| s.parse::<i64>().unwrap())
-        .fold(0, |acc, x| acc * 1000 + x)
+    let version = semver::Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+    (version.patch + version.minor * 1000 + version.major * 1000000) as i64
 }
diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock