config+server+networktest: make trickleDelay configurable

Add option to set trickleDelay for AuthenticatedGossiper in
command line, with default value of 300 milliseconds. Pass this
value to newServer, which uses it when creating a new instance of
AuthenticatedGossiper. Also set this value to 300 milliseconds when
creating nodes in integration tests.

config.go

@@ -35,6 +35,7 @@ const (
 	defaultRPCHost            = "localhost"
 	defaultMaxPendingChannels = 1
 	defaultNumChanConfs       = 1
+	defaultTrickleDelay       = 300
 )
 
 var (
@@ -125,6 +126,8 @@ type config struct {
 	Autopilot *autoPilotConfig `group:"autopilot" namespace:"autopilot"`
 
 	NoNetBootstrap bool `long:"nobootstrap" description:"If true, then automatic network bootstrapping will not be attempted."`
+
+	TrickleDelay int `long:"trickledelay" description:"Time in milliseconds between each release of announcements to the network"`
 }
 
 // loadConfig initializes and parses the config using a config file and command
@@ -162,6 +165,7 @@ func loadConfig() (*config, error) {
 			MaxChannels: 5,
 			Allocation:  0.6,
 		},
+		TrickleDelay: defaultTrickleDelay,
 	}
 
 	// Pre-parse the command line options to pick up an alternative config

discovery/gossiper.go

@@ -87,7 +87,7 @@ type Config struct {
 	// exchange the channel announcement proofs.
 	ProofMatureDelta uint32
 
-	// TrickleDelay the period of trickle timer which flushing to the
+	// TrickleDelay the period of trickle timer which flushes to the
 	// network the pending batch of new announcements we've received since
 	// the last trickle tick.
 	TrickleDelay time.Duration

networktest.go

@@ -61,6 +61,10 @@ var (
 	// seed nodes to log files.
 	logOutput = flag.Bool("logoutput", false,
 		"log output from node n to file outputn.log")
+
+	// trickleDelay is the amount of time in milliseconds between each
+	// release of announcements by AuthenticatedGossiper to the network
+	trickleDelay = 300
 )
 
 // generateListeningPorts returns two strings representing ports to listen on
@@ -127,6 +131,7 @@ func newLightningNode(btcrpcConfig *rpcclient.ConnConfig, lndArgs []string) (*li
 			RPCUser: btcrpcConfig.User,
 			RPCPass: btcrpcConfig.Pass,
 		},
+		TrickleDelay: trickleDelay,
 	}
 
 	nodeNum := numActiveNodes

server.go

@@ -278,7 +278,7 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl,
 		Broadcast:        s.BroadcastMessage,
 		SendToPeer:       s.SendToPeer,
 		ProofMatureDelta: 0,
-		TrickleDelay:     time.Millisecond * 300,
+		TrickleDelay:     time.Millisecond * time.Duration(cfg.TrickleDelay),
 		DB:               chanDB,
 		AnnSigner:        s.nodeSigner,
 	},