remove the rest of the supernode code

missed in the initial cleanup License: MIT Signed-off-by: Steven Allen <[email protected]>
medibio · Oct 14, 2017 · a0bedf6 · a0bedf6
1 parent 786d81e
commit a0bedf6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 49 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -16,7 +16,6 @@ on a running daemon do not read the config file at runtime.
 - [`Ipns`](#ipns)
 - [`Mounts`](#mounts)
 - [`Reprovider`](#reprovider)
-- [`SupernodeRouting`](#supernoderouting)
 - [`Swarm`](#swarm)
 
 ## `Addresses`
@@ -242,9 +241,6 @@ Tells reprovider what should be announced. Valid strategies are:
   - "pinned" - only announce pinned data
   - "roots" - only announce directly pinned keys and root keys of recursive pins
 
-## `SupernodeRouting`
-Deprecated.
-
 ## `Swarm`
 Options for configuring the swarm.
 

diff --git a/misc/completion/ipfs-completion.bash b/misc/completion/ipfs-completion.bash
@@ -159,7 +159,7 @@ _ipfs_config_show()
 _ipfs_daemon()
 {
     if [[ ${prev} == "--routing" ]] ; then
-        _ipfs_comp "dht supernode" # TODO: Solve autocomplete bug for "="
+        _ipfs_comp "dht dhtclient none" # TODO: Solve autocomplete bug for "="
     elif [[ ${prev} == "--mount-ipfs" ]] || [[ ${prev} == "--mount-ipns" ]] || [[ ${prev} == "=" ]]; then
         _ipfs_filesystem_complete
     elif [[ ${word} == -* ]] ; then

diff --git a/repo/config/config.go b/repo/config/config.go
@@ -14,17 +14,16 @@ import (
 
 // Config is used to load ipfs config files.
 type Config struct {
-	Identity         Identity              // local node's peer identity
-	Datastore        Datastore             // local node's storage
-	Addresses        Addresses             // local node's addresses
-	Mounts           Mounts                // local node's mount points
-	Discovery        Discovery             // local node's discovery mechanisms
-	Ipns             Ipns                  // Ipns settings
-	Bootstrap        []string              // local nodes's bootstrap peer addresses
-	Gateway          Gateway               // local node's gateway server options
-	SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
-	API              API                   // local node's API settings
-	Swarm            SwarmConfig
+	Identity  Identity  // local node's peer identity
+	Datastore Datastore // local node's storage
+	Addresses Addresses // local node's addresses
+	Mounts    Mounts    // local node's mount points
+	Discovery Discovery // local node's discovery mechanisms
+	Ipns      Ipns      // Ipns settings
+	Bootstrap []string  // local nodes's bootstrap peer addresses
+	Gateway   Gateway   // local node's gateway server options
+	API       API       // local node's API settings
+	Swarm     SwarmConfig
 
 	Reprovider   Reprovider
 	Experimental Experiments

diff --git a/repo/config/supernode.go b/repo/config/supernode.go