Fix supported versions to include -rc

subsquid · May 16, 2024 · 4458d8e · 4458d8e
1 parent 91ae986
commit 4458d8e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/network-scheduler/src/scheduler.rs b/crates/network-scheduler/src/scheduler.rs
@@ -21,7 +21,10 @@ use crate::scheduling_unit::{SchedulingUnit, UnitId};
 use crate::worker_state::{JailReason, WorkerState};
 
 lazy_static! {
-    pub static ref SUPPORTED_WORKER_VERSIONS: VersionReq = ">=0.4.0".parse().unwrap();
+    pub static ref SUPPORTED_WORKER_VERSIONS: [VersionReq; 2] = [
+        ">=0.4.0".parse().unwrap(),
+        ">=1.0.0-rc1".parse().unwrap(),  // >=0.4.0 does not match release candidates
+    ];
 }
 const WORKER_ID_HEADER: &str = "worker-id";
 const WORKER_SIGNATURE_HEADER: &str = "worker-signature";
@@ -87,7 +90,10 @@ impl Scheduler {
     /// Register ping msg from a worker. Returns worker status if ping was accepted, otherwise None
     pub fn ping(&mut self, worker_id: PeerId, msg: Ping) -> WorkerStatus {
         let version = msg.sem_version();
-        if !SUPPORTED_WORKER_VERSIONS.matches(&version) {
+        if !SUPPORTED_WORKER_VERSIONS
+            .iter()
+            .any(|v| v.matches(&version))
+        {
             log::debug!("Worker {worker_id} version not supported: {}", version);
             return WorkerStatus::UnsupportedVersion(());
         }

diff --git a/crates/query-gateway/src/server.rs b/crates/query-gateway/src/server.rs
@@ -28,7 +28,10 @@ use crate::task::Task;
 const COMP_UNITS_PER_QUERY: u32 = 1;
 
 lazy_static! {
-    pub static ref SUPPORTED_WORKER_VERSIONS: VersionReq = ">=0.3.0".parse().unwrap();
+    pub static ref SUPPORTED_WORKER_VERSIONS: [VersionReq; 2] = [
+        ">=0.4.0".parse().unwrap(),
+        ">=1.0.0-rc1".parse().unwrap(),  // >=0.4.0 does not match release candidates
+    ];
 }
 
 pub struct Server<S: Stream<Item = GatewayEvent> + Send + Unpin + 'static> {
@@ -230,7 +233,10 @@ impl<S: Stream<Item = GatewayEvent> + Send + Unpin + 'static> Server<S> {
         log::trace!("Ping from {peer_id}: {ping:?}");
 
         let version = ping.sem_version();
-        if !SUPPORTED_WORKER_VERSIONS.matches(&version) {
+        if !SUPPORTED_WORKER_VERSIONS
+            .iter()
+            .any(|v| v.matches(&version))
+        {
             return log::debug!("Worker {peer_id} version not supported: {}", version);
         }