Refactor: remove unneeded error handling, since RaftNetworkFactory::n…

…ew_client() does not return an error
databendlabs · Mar 4, 2023 · 703a5cf · 703a5cf
1 parent 129afb3
commit 703a5cf
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/openraft/src/core/raft_core.rs b/openraft/src/core/raft_core.rs
@@ -1359,30 +1359,26 @@ impl<C: RaftTypeConfig, N: RaftNetworkFactory<C>, S: RaftStorage<C>> RaftRuntime
             }
             Command::Replicate { req, target } => {
                 if let Some(l) = &self.leader_data {
-                    let node = &l.nodes.get(&target);
+                    let node = l.nodes.get(&target).expect("replication to target node exists");
 
-                    if let Some(node) = node {
-                        match req {
-                            Inflight::None => {
-                                let _ = node.tx_repl.send(Replicate::Heartbeat);
-                            }
-                            Inflight::Logs { id, log_id_range } => {
-                                let _ = node.tx_repl.send(Replicate::logs(id, log_id_range));
-                            }
-                            Inflight::Snapshot { id, last_log_id } => {
-                                let snapshot = self.storage.get_current_snapshot().await?;
-                                tracing::debug!("snapshot: {}", snapshot.as_ref().map(|x| &x.meta).summary());
-
-                                if let Some(snapshot) = snapshot {
-                                    debug_assert_eq!(last_log_id, snapshot.meta.last_log_id);
-                                    let _ = node.tx_repl.send(Replicate::snapshot(id, snapshot));
-                                } else {
-                                    unreachable!("No snapshot");
-                                }
+                    match req {
+                        Inflight::None => {
+                            let _ = node.tx_repl.send(Replicate::Heartbeat);
+                        }
+                        Inflight::Logs { id, log_id_range } => {
+                            let _ = node.tx_repl.send(Replicate::logs(id, log_id_range));
+                        }
+                        Inflight::Snapshot { id, last_log_id } => {
+                            let snapshot = self.storage.get_current_snapshot().await?;
+                            tracing::debug!("snapshot: {}", snapshot.as_ref().map(|x| &x.meta).summary());
+
+                            if let Some(snapshot) = snapshot {
+                                debug_assert_eq!(last_log_id, snapshot.meta.last_log_id);
+                                let _ = node.tx_repl.send(Replicate::snapshot(id, snapshot));
+                            } else {
+                                unreachable!("No snapshot");
                             }
                         }
-                    } else {
-                        // TODO(2): if no such node, return an RemoteError?
                     }
                 } else {
                     unreachable!("it has to be a leader!!!");