Merge pull request #4845 from ipfs/fix/default-net-bootstrap

fix default-net profile not reverting bootstrap config

Author: whyrusleeping

repo/config/profile.go

@@ -86,6 +86,12 @@ Inverse profile of the test profile.`,
 		Transform: func(c *Config) error {
 			c.Addresses = addressesConfig()
 
+			bootstrapPeers, err := DefaultBootstrapPeers()
+			if err != nil {
+				return err
+			}
+			c.Bootstrap = appendSingle(c.Bootstrap, BootstrapPeerStrings(bootstrapPeers))
+
 			c.Swarm.DisableNatPortMap = false
 			c.Discovery.MDNS.Enabled = true
 			return nil
@@ -156,14 +162,21 @@ fetching may be degraded.
 }
 
 func appendSingle(a []string, b []string) []string {
-	m := map[string]struct{}{}
+	out := make([]string, 0, len(a)+len(b))
+	m := map[string]bool{}
 	for _, f := range a {
-		m[f] = struct{}{}
+		if !m[f] {
+			out = append(out, f)
+		}
+		m[f] = true
 	}
 	for _, f := range b {
-		m[f] = struct{}{}
+		if !m[f] {
+			out = append(out, f)
+		}
+		m[f] = true
 	}
-	return mapKeys(m)
+	return out
 }
 
 func deleteEntries(arr []string, del []string) []string {

test/sharness/t0021-config.sh

@@ -212,8 +212,13 @@ test_config_cmd() {
 
   test_profile_apply_revert server local-discovery
 
-  # won't work as we already have this profile applied
-  # test_profile_apply_revert test
+  # tests above mess with values this profile changes, need to do that before testing test profile
+  test_expect_success "ensure test profile is applied fully" '
+    ipfs config profile apply test
+  '
+
+  # need to do this in reverse as the test profile is already applied in sharness
+  test_profile_apply_revert default-networking test
 
   # won't work as it changes datastore definition, which makes ipfs not launch
   # without converting first