Merge pull request #3406 from cfromknecht/die-spew

pilot+discovery: die spew

discovery/gossiper.go

@@ -2020,8 +2020,8 @@ func (d *AuthenticatedGossiper) processNetworkAnnouncement(
 			prefix = "remote"
 		}
 
-		log.Infof("Received new %v channel announcement: %v", prefix,
-			spew.Sdump(msg))
+		log.Infof("Received new %v channel announcement for %v", prefix,
+			msg.ShortChannelID)
 
 		// By the specification, channel announcement proofs should be
 		// sent after some number of confirmations after channel was

pilot.go

@@ -8,7 +8,6 @@ import (
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/autopilot"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/tor"
@@ -142,7 +141,10 @@ var _ autopilot.ChannelController = (*chanController)(nil)
 // and all interfaces needed to drive it won't be launched before the Manager's
 // StartAgent method is called.
 func initAutoPilot(svr *server, cfg *autoPilotConfig) (*autopilot.ManagerCfg, error) {
-	atplLog.Infof("Instantiating autopilot with cfg: %v", spew.Sdump(cfg))
+	atplLog.Infof("Instantiating autopilot with max_channels=%d, "+
+		"allocation=%f, min_chan_size=%d, max_chan_size=%d, "+
+		"private=%t, min_confs=%d, conf_target=%d", cfg.MaxChannels,
+		cfg.MinChannelSize, cfg.Private, cfg.MinConfs, cfg.ConfTarget)
 
 	// Set up the constraints the autopilot heuristics must adhere to.
 	atplConstraints := autopilot.NewConstraints(

utxonursery.go

@@ -498,7 +498,7 @@ func (u *utxoNursery) NurseryReport(
 	u.mu.Lock()
 	defer u.mu.Unlock()
 
-	utxnLog.Infof("NurseryReport: building nursery report for channel %v",
+	utxnLog.Debugf("NurseryReport: building nursery report for channel %v",
 		chanPoint)
 
 	report := &contractMaturityReport{}