From 676ad1b61e23cd95e3fba38e49cc1190be152910 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <code@hector.link>
Date: Mon, 5 Aug 2019 18:23:23 +0200
Subject: [PATCH] CRDT: TrustAll by default.

---
 consensus/crdt/config.go      | 10 ++++++++--
 consensus/crdt/config_test.go |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/consensus/crdt/config.go b/consensus/crdt/config.go
index 8a6bddee..d8bea834 100644
--- a/consensus/crdt/config.go
+++ b/consensus/crdt/config.go
@@ -24,6 +24,7 @@ var (
 	DefaultDatastoreNamespace  = "/c" // from "/crdt"
 	DefaultRebroadcastInterval = time.Minute
 	DefaultTrustedPeers        = []peer.ID{}
+	DefaultTrustAll            = true
 )
 
 // Config is the configuration object for Consensus.
@@ -136,11 +137,16 @@ func (cfg *Config) ToJSON() ([]byte, error) {
 func (cfg *Config) toJSONConfig() *jsonConfig {
 	jcfg := &jsonConfig{
 		ClusterName:         cfg.ClusterName,
-		TrustedPeers:        api.PeersToStrings(cfg.TrustedPeers),
 		PeersetMetric:       "",
 		RebroadcastInterval: "",
 	}
 
+	if cfg.TrustAll {
+		jcfg.TrustedPeers = []string{"*"}
+	} else {
+		jcfg.TrustedPeers = api.PeersToStrings(cfg.TrustedPeers)
+	}
+
 	if cfg.PeersetMetric != DefaultPeersetMetric {
 		jcfg.PeersetMetric = cfg.PeersetMetric
 		// otherwise leave empty/hidden
@@ -165,7 +171,7 @@ func (cfg *Config) Default() error {
 	cfg.PeersetMetric = DefaultPeersetMetric
 	cfg.DatastoreNamespace = DefaultDatastoreNamespace
 	cfg.TrustedPeers = DefaultTrustedPeers
-	cfg.TrustAll = false
+	cfg.TrustAll = DefaultTrustAll
 	return nil
 }
 
diff --git a/consensus/crdt/config_test.go b/consensus/crdt/config_test.go
index a39bfb25..145fe078 100644
--- a/consensus/crdt/config_test.go
+++ b/consensus/crdt/config_test.go
@@ -18,8 +18,8 @@ func TestLoadJSON(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if cfg.TrustAll {
-		t.Error("expected TrustAll to be false")
+	if cfg.TrustAll != DefaultTrustAll {
+		t.Error("expected TrustAll to be the default")
 	}
 
 	cfg = &Config{}