update: find_index

Author: samparsky

primitives/src/channel.rs

@@ -232,13 +232,13 @@ impl SpecValidators {
         }
     }
 
-    pub fn find_index(&self, validator_id: &ValidatorId) -> i32 {
+    pub fn find_index(&self, validator_id: &ValidatorId) -> Option<i32> {
         if &self.leader().id == validator_id {
-            0
+            Some(0)
         } else if &self.follower().id == validator_id {
-            1
+            Some(1)
         } else {
-            -1
+            None
         }
     }
 

sentry/src/routes/channel.rs

@@ -254,16 +254,15 @@ pub async fn create_validator_messages<A: Adapter + 'static>(
             .await?;
 
             if channel_is_exhausted {
-                // can never be -1
-                let validator_index = channel.spec.validators.find_index(&session.uid);                
-                update_exhausted_channel(
-                    &app.pool,
-                    &channel,
-                    validator_index
-                ).await?;
+                if let Some(validator_index) = channel.spec.validators.find_index(&session.uid) {
+                    update_exhausted_channel(
+                        &app.pool,
+                        &channel,
+                        validator_index
+                    ).await?;
+                }
             }
 
-
             Ok(success_response(serde_json::to_string(&SuccessResponse {
                 success: true,
             })?))