chore(misc): Change default discovery (#1659)

Satellite-im · Dec 21, 2023 · 3d16b89 · 3d16b89
1 parent 8307de4
commit 3d16b89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -60,13 +60,13 @@ pub enum DiscoveryMode {
     Full,
 
     /// Use warp specific discovery
+    #[default]
     Shuttle,
 
     /// Address to a specific discovery point
     RzPoint { address: String },
 
     /// Disable discovery
-    #[default]
     Disable,
 }
 

diff --git a/common/src/warp_runner/mod.rs b/common/src/warp_runner/mod.rs
@@ -358,26 +358,16 @@ impl From<&DiscoveryMode> for Discovery {
                     addresses: vec![address.parse().expect("Valid multiaddr address")],
                 },
             },
-            DiscoveryMode::Shuttle => {
-                #[cfg(not(feature = "production_mode"))]
-                {
-                    Discovery::Shuttle {
-                        addresses: HashMap::from_iter([(
-                            "12D3KooWJSes8386p2T1sMeZ2DzsNJThKkZWbj4US6uPMpEgBTHu"
-                                .parse()
-                                .expect("Valid id"),
-                            HashSet::from_iter(["/ip4/104.236.194.35/tcp/34053"
-                                .parse()
-                                .expect("valid addr")]),
-                        )]),
-                    }
-                }
-                #[cfg(feature = "production_mode")]
-                {
-                    //TODO: Add a production map
-                    Discovery::None
-                }
-            }
+            DiscoveryMode::Shuttle => Discovery::Shuttle {
+                addresses: HashMap::from_iter([(
+                    "12D3KooWJSes8386p2T1sMeZ2DzsNJThKkZWbj4US6uPMpEgBTHu"
+                        .parse()
+                        .expect("Valid id"),
+                    HashSet::from_iter(["/ip4/104.236.194.35/tcp/34053"
+                        .parse()
+                        .expect("valid addr")]),
+                )]),
+            },
             DiscoveryMode::Disable => Discovery::None,
         }
     }