minor doc changes and a few sacrificies to the linter gods

config/toml.go

@@ -464,12 +464,14 @@ namespace = "{{ .Instrumentation.Namespace }}"
 # IPFS repo root.
 repo-root = "{{ .IPFS.ConfigRootPath}}"
 
+## Below options will be passed to ipfs when initializing an ipfs repo.
+## They will be written into the repo-root/config on init.
+## To modify the generated config, edit repo-root/config accordingly.
+
 # Address for the local API (RPC).
 api = "{{ .IPFS.API }}"
-
 # Address to listen on for IPFS HTTP object gateway.
 gateway = "{{ .IPFS.Gateway }}
-
 # Addresses for the swarm to listen on
 swarm = "[{{ range .IPFS.Swarm }}{{ printf "%q, " . }}{{end}}]"
 # Swarm addresses to announce to the network

consensus/state.go

@@ -810,7 +810,7 @@ func (cs *State) handleMsg(mi msgInfo) {
 		// We probably don't want to stop the peer here. The vote does not
 		// necessarily comes from a malicious peer but can be just broadcasted by
 		// a typical peer.
-		// https://github.com/lazyledger/lazyledger-core/issues/1281
+		// https://github.com/tendermint/lazyledger-core/issues/1281
 		// }
 
 		// NOTE: the vote is broadcast to peers by the reactor listening

node/node.go

@@ -1479,15 +1479,12 @@ func setupPlugins(path string, logger log.Logger) error {
 	if err != nil {
 		return fmt.Errorf("error loading plugins: %s", err)
 	}
-	plugins.Load(&nodes.LazyLedgerPlugin{})
-	if err != nil {
+	if err := plugins.Load(&nodes.LazyLedgerPlugin{}); err != nil {
 		return fmt.Errorf("error loading lazyledger plugin: %s", err)
 	}
-
 	if err := plugins.Initialize(); err != nil {
 		return fmt.Errorf("error initializing plugins: plugins.Initialize(): %s", err)
 	}
-
 	if err := plugins.Inject(); err != nil {
 		logger.Error("error initializing plugins: could not Inject()", "err", err)
 	}

rpc/test/helpers.go

@@ -211,7 +211,6 @@ func initIpfs(config *cfg.Config, loadPlugins bool, log log.Logger) error { // a
 		if err != nil {
 			return err
 		}
-
 		if err := tmos.EnsureDir(repoRoot, 0700); err != nil {
 			return err
 		}
@@ -223,18 +222,16 @@ func initIpfs(config *cfg.Config, loadPlugins bool, log log.Logger) error { // a
 			if err := plugins.Load(&nodes.LazyLedgerPlugin{}); err != nil {
 				return err
 			}
-
 			if err := plugins.Initialize(); err != nil {
 				return fmt.Errorf("error initializing plugins: %s", err)
 			}
-
 			if err := plugins.Inject(); err != nil {
 				return fmt.Errorf("error initializing plugins: %s", err)
 			}
 		}
 		conf, err = ipfscfg.InitWithIdentity(identity)
 		if err != nil {
-			return fmt.Errorf("InitWithIdentity(): %w", err)
+			return fmt.Errorf("intializing config failed, InitWithIdentity(): %w", err)
 		}
 
 		if err := fsrepo.Init(repoRoot, conf); err != nil {
@@ -258,7 +255,8 @@ func RecreateConfig(o *Options) {
 	o.recreateConfig = true
 }
 
-// DoNotLoadIpfsPlugins
+// DoNotLoadIpfsPlugins instructs the RPC test to not load the IPFS plugins, e.g.,
+// to prevent loading them several times.
 func DoNotLoadIpfsPlugins(o *Options) {
 	o.loadIpfsPlugins = false
 }