node: Move measurement validation out of api client

Author: MaxFangX

node/src/api/client.rs

@@ -102,19 +102,8 @@ impl ApiClient for LexeApiClient {
             user_pk,
             measurement,
         };
-        let maybe_instance: Option<Instance> = self
-            .request(&GET, Backend, V1, "/instance", &data).await?;
-
-        if let Some(instance) = maybe_instance.as_ref() {
-            if instance.measurement != measurement {
-                let msg = format!(
-                    "returned instance measurement '{}' doesn't match \
-                     requested measurement '{}'",
-                    instance.measurement, measurement,
-                );
-                return Err(ApiError::ResponseError(msg));
-            }
-        }
+        let maybe_instance: Option<Instance> =
+            self.request(&GET, Backend, V1, "/instance", &data).await?;
 
         Ok(maybe_instance)
     }

node/src/api/mod.rs

@@ -28,9 +28,6 @@ pub enum ApiError {
 
     #[error("Server Error: {0}")]
     Server(String),
-
-    #[error("Invalid response: {0}")]
-    ResponseError(String),
 }
 
 #[async_trait]

node/src/init.rs

@@ -26,8 +26,8 @@ use lightning_invoice::utils::DefaultRouter;
 use tokio::net::TcpListener;
 use tokio::runtime::Handle;
 use tokio::sync::{broadcast, mpsc};
-use tracing::{debug, error, info, instrument};
 use tokio::task::JoinHandle;
+use tracing::{debug, error, info, instrument};
 
 use crate::api::ApiClient;
 use crate::event_handler::LdkEventHandler;
@@ -490,6 +490,13 @@ async fn fetch_provisioned_secrets(
                 node.node_pk,
                 instance.node_pk,
             );
+            ensure!(
+                instance.measurement == measurement,
+                "Returned instance measurement '{}' doesn't match \
+                 requested measurement '{}'",
+                instance.measurement,
+                measurement,
+            );
 
             let sealed_seed_id = SealedSeedId {
                 node_pk: node.node_pk,