config: apply review to lowpower profile

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
ipfs · Jan 22, 2018 · b1afa87 · b1afa87
1 parent 43f1b0d
commit b1afa87
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 15 deletions.
diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
@@ -308,11 +308,11 @@ func daemonFunc(req cmds.Request, re cmds.ResponseEmitter) {
 	if routingOption == routingOptionDefaultKwd {
 		cfg, err := repo.Config()
 		if err != nil {
-			res.SetError(err, cmds.ErrNormal)
+			re.SetError(err, cmdkit.ErrNormal)
 			return
 		}
 
-		routingOption = cfg.Discovery.Routing
+		routingOption = cfg.Routing.Type
 		if routingOption == "" {
 			routingOption = routingOptionDHTKwd
 		}

diff --git a/docs/config.md b/docs/config.md
@@ -203,7 +203,6 @@ Valid modes are:
   - `dht` (default)
   - `dhtclient`
   - `none`
-  - `supernode` (deprecated)
 
 ## `Gateway`
 Options for the HTTP gateway.

diff --git a/repo/config/config.go b/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

diff --git a/repo/config/discovery.go b/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 {

diff --git a/repo/config/init.go b/repo/config/init.go
@@ -38,7 +38,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.

diff --git a/repo/config/profile.go b/repo/config/profile.go
@@ -1,5 +1,7 @@
 package config
 
+import "time"
+
 // Transformer is a function which takes configuration and applies some filter to it
 type Transformer func(c *Config) error
 
@@ -74,8 +76,12 @@ var Profiles = map[string]Transformer{
 		return nil
 	},
 	"lowpower": func(c *Config) error {
-		c.Discovery.Routing = "dhtclient"
+		c.Routing.Type = "dhtclient"
 		c.Reprovider.Interval = "0"
+
+		c.Swarm.ConnMgr.LowWater = 20
+		c.Swarm.ConnMgr.HighWater = 40
+		c.Swarm.ConnMgr.GracePeriod = time.Minute.String()
 		return nil
 	},
 }

diff --git a/repo/config/routing.go b/repo/config/routing.go
@@ -0,0 +1,7 @@
+package config
+
+// Routing defines configuration options for libp2p routing
+type Routing struct {
+	// Type sets default daemon routing mode.
+	Type string
+}
diff --git a/test/sharness/t0020-init.sh b/test/sharness/t0020-init.sh
@@ -168,17 +168,17 @@ test_expect_success "clean up ipfs dir" '
 '
 
 test_expect_success "'ipfs init --profile=lowpower' succeeds" '
-	BITS="1024" &&
-	ipfs init --bits="$BITS" --profile=lowpower
+  BITS="1024" &&
+  ipfs init --bits="$BITS" --profile=lowpower
 '
 
 test_expect_success "'ipfs config Discovery.Routing' looks good" '
-	ipfs config Discovery.Routing > actual_config &&
-	test $(cat actual_config) = "dhtclient"
+  ipfs config Routing.Type > actual_config &&
+  test $(cat actual_config) = "dhtclient"
 '
 
 test_expect_success "clean up ipfs dir" '
-	rm -rf "$IPFS_PATH"
+  rm -rf "$IPFS_PATH"
 '
 
 test_init_ipfs

diff --git a/test/sharness/t0021-config.sh b/test/sharness/t0021-config.sh
@@ -45,8 +45,7 @@ CONFIG_SET_JSON_TEST='{
   "MDNS": {
     "Enabled": true,
     "Interval": 10
-  },
-  "Routing": "dht"
+  }
 }'
 
 test_profile_apply_revert() {