Fix linter errors thrown by lll (#3970)

* Fix long line errors in abci, crypto, and libs packages

* Fix long lines in p2p and rpc packages

* Fix long lines in abci, state, and tools packages

* Fix long lines in behaviour and blockchain packages

* Fix long lines in cmd and config packages

* Begin fixing long lines in consensus package

* Finish fixing long lines in consensus package

* Add lll exclusion for lines containing URLs

* Fix long lines in crypto package

* Fix long lines in evidence package

* Fix long lines in mempool and node packages

* Fix long lines in libs package

* Fix long lines in lite package

* Fix new long line in node package

* Fix long lines in p2p package

* Ignore gocritic warning

* Fix long lines in privval package

* Fix long lines in rpc package

* Fix long lines in scripts package

* Fix long lines in state package

* Fix long lines in tools package

* Fix long lines in types package

* Enable lll linter

libs/log/filter.go

@@ -72,10 +72,14 @@ func (l *filter) Error(msg string, keyvals ...interface{}) {
 //     logger = log.NewFilter(logger, log.AllowError(), log.AllowInfoWith("module", "crypto"))
 //		 logger.With("module", "crypto").Info("Hello") # produces "I... Hello module=crypto"
 //
-//     logger = log.NewFilter(logger, log.AllowError(), log.AllowInfoWith("module", "crypto"), log.AllowNoneWith("user", "Sam"))
+//     logger = log.NewFilter(logger, log.AllowError(),
+//				log.AllowInfoWith("module", "crypto"),
+// 				log.AllowNoneWith("user", "Sam"))
 //		 logger.With("module", "crypto", "user", "Sam").Info("Hello") # returns nil
 //
-//     logger = log.NewFilter(logger, log.AllowError(), log.AllowInfoWith("module", "crypto"), log.AllowNoneWith("user", "Sam"))
+//     logger = log.NewFilter(logger,
+// 				log.AllowError(),
+// 				log.AllowInfoWith("module", "crypto"), log.AllowNoneWith("user", "Sam"))
 //		 logger.With("user", "Sam").With("module", "crypto").Info("Hello") # produces "I... Hello module=crypto user=Sam"
 func (l *filter) With(keyvals ...interface{}) Logger {
 	keyInAllowedKeyvals := false

libs/log/filter_test.go

@@ -79,7 +79,10 @@ func TestLevelContext(t *testing.T) {
 	logger = logger.With("context", "value")
 
 	logger.Error("foo", "bar", "baz")
-	if want, have := `{"_msg":"foo","bar":"baz","context":"value","level":"error"}`, strings.TrimSpace(buf.String()); want != have {
+
+	want := `{"_msg":"foo","bar":"baz","context":"value","level":"error"}`
+	have := strings.TrimSpace(buf.String())
+	if want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
 	}
 
@@ -97,13 +100,22 @@ func TestVariousAllowWith(t *testing.T) {
 
 	logger1 := log.NewFilter(logger, log.AllowError(), log.AllowInfoWith("context", "value"))
 	logger1.With("context", "value").Info("foo", "bar", "baz")
-	if want, have := `{"_msg":"foo","bar":"baz","context":"value","level":"info"}`, strings.TrimSpace(buf.String()); want != have {
+
+	want := `{"_msg":"foo","bar":"baz","context":"value","level":"info"}`
+	have := strings.TrimSpace(buf.String())
+	if want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
 	}
 
 	buf.Reset()
 
-	logger2 := log.NewFilter(logger, log.AllowError(), log.AllowInfoWith("context", "value"), log.AllowNoneWith("user", "Sam"))
+	logger2 := log.NewFilter(
+		logger,
+		log.AllowError(),
+		log.AllowInfoWith("context", "value"),
+		log.AllowNoneWith("user", "Sam"),
+	)
+
 	logger2.With("context", "value", "user", "Sam").Info("foo", "bar", "baz")
 	if want, have := ``, strings.TrimSpace(buf.String()); want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
@@ -111,9 +123,18 @@ func TestVariousAllowWith(t *testing.T) {
 
 	buf.Reset()
 
-	logger3 := log.NewFilter(logger, log.AllowError(), log.AllowInfoWith("context", "value"), log.AllowNoneWith("user", "Sam"))
+	logger3 := log.NewFilter(
+		logger,
+		log.AllowError(),
+		log.AllowInfoWith("context", "value"),
+		log.AllowNoneWith("user", "Sam"),
+	)
+
 	logger3.With("user", "Sam").With("context", "value").Info("foo", "bar", "baz")
-	if want, have := `{"_msg":"foo","bar":"baz","context":"value","level":"info","user":"Sam"}`, strings.TrimSpace(buf.String()); want != have {
+
+	want = `{"_msg":"foo","bar":"baz","context":"value","level":"info","user":"Sam"}`
+	have = strings.TrimSpace(buf.String())
+	if want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
 	}
 }

libs/log/tracing_logger_test.go

@@ -20,22 +20,45 @@ func TestTracingLogger(t *testing.T) {
 	err1 := errors.New("Courage is grace under pressure.")
 	err2 := errors.New("It does not matter how slowly you go, so long as you do not stop.")
 	logger1.With("err1", err1).Info("foo", "err2", err2)
+
+	want := strings.Replace(
+		strings.Replace(
+			`{"_msg":"foo","err1":"`+
+				fmt.Sprintf("%+v", err1)+
+				`","err2":"`+
+				fmt.Sprintf("%+v", err2)+
+				`","level":"info"}`,
+			"\t", "", -1,
+		), "\n", "", -1)
 	have := strings.Replace(strings.Replace(strings.TrimSpace(buf.String()), "\\n", "", -1), "\\t", "", -1)
-	if want := strings.Replace(strings.Replace(`{"_msg":"foo","err1":"`+fmt.Sprintf("%+v", err1)+`","err2":"`+fmt.Sprintf("%+v", err2)+`","level":"info"}`, "\t", "", -1), "\n", "", -1); want != have {
+	if want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
 	}
 
 	buf.Reset()
 
-	logger.With("err1", stderr.New("Opportunities don't happen. You create them.")).Info("foo", "err2", stderr.New("Once you choose hope, anything's possible."))
-	if want, have := `{"_msg":"foo","err1":"Opportunities don't happen. You create them.","err2":"Once you choose hope, anything's possible.","level":"info"}`, strings.TrimSpace(buf.String()); want != have {
+	logger.With(
+		"err1", stderr.New("Opportunities don't happen. You create them."),
+	).Info(
+		"foo", "err2", stderr.New("Once you choose hope, anything's possible."),
+	)
+
+	want = `{"_msg":"foo",` +
+		`"err1":"Opportunities don't happen. You create them.",` +
+		`"err2":"Once you choose hope, anything's possible.",` +
+		`"level":"info"}`
+	have = strings.TrimSpace(buf.String())
+	if want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
 	}
 
 	buf.Reset()
 
 	logger.With("user", "Sam").With("context", "value").Info("foo", "bar", "baz")
-	if want, have := `{"_msg":"foo","bar":"baz","context":"value","level":"info","user":"Sam"}`, strings.TrimSpace(buf.String()); want != have {
+
+	want = `{"_msg":"foo","bar":"baz","context":"value","level":"info","user":"Sam"}`
+	have = strings.TrimSpace(buf.String())
+	if want != have {
 		t.Errorf("\nwant '%s'\nhave '%s'", want, have)
 	}
 }