config: apply review to lowpower profile

License: MIT
Signed-off-by: Łukasz Magiera <[email protected]>

Author: magik6k

cmd/ipfs/daemon.go

@@ -308,7 +308,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
 			return
 		}
 
-		routingOption = cfg.Discovery.Routing
+		routingOption = cfg.Routing.Type
 		if routingOption == "" {
 			routingOption = routingOptionDHTKwd
 		}

docs/config.md

@@ -153,7 +153,6 @@ Valid modes are:
   - `dht` (default)
   - `dhtclient`
   - `none`
-  - `supernode` (deprecated)
 
 ## `Gateway`
 Options for the HTTP gateway.

repo/config/config.go

@@ -19,6 +19,7 @@ type Config struct {
 	Addresses Addresses // local node's addresses
 	Mounts    Mounts    // local node's mount points
 	Discovery Discovery // local node's discovery mechanisms
+	Routing   Routing   // local node's routing settings
 	Ipns      Ipns      // Ipns settings
 	Bootstrap []string  // local nodes's bootstrap peer addresses
 	Gateway   Gateway   // local node's gateway server options

repo/config/discovery.go

@@ -2,9 +2,6 @@ package config
 
 type Discovery struct {
 	MDNS MDNS
-
-	//Routing sets default daemon routing mode.
-	Routing string
 }
 
 type MDNS struct {

repo/config/init.go

@@ -48,7 +48,10 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
 				Enabled:  true,
 				Interval: 10,
 			},
-			Routing: "dht",
+		},
+
+		Routing: Routing{
+			Type: "dht",
 		},
 
 		// setup the node mount points.

repo/config/profile.go

@@ -54,7 +54,7 @@ var ConfigProfiles = map[string]func(*Config) error{
 		return nil
 	},
 	"lowpower": func(c *Config) error {
-		c.Discovery.Routing = "dhtclient"
+		c.Routing.Type = "dhtclient"
 		c.Reprovider.Interval = "0"
 		return nil
 	},

repo/config/routing.go

@@ -0,0 +1,6 @@
+package config
+
+type Routing struct {
+	// Type sets default daemon routing mode.
+	Type string
+}

test/sharness/t0020-init.sh

@@ -173,7 +173,7 @@ test_expect_success "'ipfs init --profile=lowpower' succeeds" '
 '
 
 test_expect_success "'ipfs config Discovery.Routing' looks good" '
-	ipfs config Discovery.Routing > actual_config &&
+	ipfs config Routing.Type > actual_config &&
 	test $(cat actual_config) = "dhtclient"
 '
 

test/sharness/t0021-config.sh

@@ -45,8 +45,7 @@ CONFIG_SET_JSON_TEST='{
   "MDNS": {
     "Enabled": true,
     "Interval": 10
-  },
-  "Routing": "dht"
+  }
 }'
 
 test_config_cmd() {