From cc8929cae4242c702dc39d17c61eca8529273b2a Mon Sep 17 00:00:00 2001
From: "yakumo.izuru" <yakumo.izuru@f0ae65fe-ee39-954e-97ec-027ff2717ef4>
Date: Fri, 5 May 2023 00:50:19 +0000
Subject: [PATCH] Do some tidying

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/suika/trunk@818 f0ae65fe-ee39-954e-97ec-027ff2717ef4
---
 db_sqlite_test.go |  2 +-
 server.go         | 26 ++++++++++++++------------
 service.go        |  8 +++++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/db_sqlite_test.go b/db_sqlite_test.go
index 9dfcd80..a7c9794 100644
--- a/db_sqlite_test.go
+++ b/db_sqlite_test.go
@@ -41,7 +41,7 @@ PRAGMA user_version = 1;
 `
 
 func TestSqliteMigrations(t *testing.T) {
-	sqlDB, err := sql.Open("sqlite3", ":memory:")
+	sqlDB, err := sql.Open("sqlite", ":memory:")
 	if err != nil {
 		t.Fatalf("failed to create temporary SQLite database: %v", err)
 	}
diff --git a/server.go b/server.go
index e8339be..bd5f7d2 100644
--- a/server.go
+++ b/server.go
@@ -23,18 +23,20 @@ import (
 )
 
 // TODO: make configurable
-var retryConnectMinDelay = time.Minute
-var retryConnectMaxDelay = 10 * time.Minute
-var retryConnectJitter = time.Minute
-var connectTimeout = 15 * time.Second
-var writeTimeout = 10 * time.Second
-var upstreamMessageDelay = 2 * time.Second
-var upstreamMessageBurst = 10
-var backlogTimeout = 10 * time.Second
-var handleDownstreamMessageTimeout = 10 * time.Second
-var downstreamRegisterTimeout = 30 * time.Second
-var chatHistoryLimit = 1000
-var backlogLimit = 4000
+var (
+	retryConnectMinDelay = time.Minute
+	retryConnectMaxDelay = 10 * time.Minute
+	retryConnectJitter = time.Minute
+	connectTimeout = 15 * time.Second
+	writeTimeout = 10 * time.Second
+	upstreamMessageDelay = 2 * time.Second
+	upstreamMessageBurst = 10
+	backlogTimeout = 10 * time.Second
+	handleDownstreamMessageTimeout = 10 * time.Second
+	downstreamRegisterTimeout = 30 * time.Second
+	chatHistoryLimit = 1000
+	backlogLimit = 4000
+)
 
 type Logger interface {
 	Printf(format string, v ...interface{})
diff --git a/service.go b/service.go
index f622ed9..71bb816 100644
--- a/service.go
+++ b/service.go
@@ -19,9 +19,11 @@ import (
 	"gopkg.in/irc.v3"
 )
 
-const serviceNick = "BouncerServ"
-const serviceNickCM = "bouncerserv"
-const serviceRealname = "suika bouncer service"
+const (
+	serviceNick = "BouncerServ"
+	serviceNickCM = "bouncerserv"
+	serviceRealname = "suika bouncer service"
+)
 
 // maxRSABits is the maximum number of RSA key bits used when generating a new
 // private key.