From e149a50f22f226538e2aa59bf0c5408d6ebbf60a Mon Sep 17 00:00:00 2001
From: stasatdaglabs <39559713+stasatdaglabs@users.noreply.github.com>
Date: Wed, 29 Aug 2018 15:20:42 +0300
Subject: [PATCH] [DEV-101] Renamed server/rpcserver to server/rpc. (#55)

---
 server/{rpcserver => rpc}/log.go                | 2 +-
 server/{rpcserver => rpc}/rpcadapters.go        | 2 +-
 server/{rpcserver => rpc}/rpcserver.go          | 2 +-
 server/{rpcserver => rpc}/rpcserverhelp.go      | 2 +-
 server/{rpcserver => rpc}/rpcserverhelp_test.go | 2 +-
 server/{rpcserver => rpc}/rpcwebsocket.go       | 2 +-
 server/server.go                                | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename server/{rpcserver => rpc}/log.go (96%)
 rename server/{rpcserver => rpc}/rpcadapters.go (99%)
 rename server/{rpcserver => rpc}/rpcserver.go (99%)
 rename server/{rpcserver => rpc}/rpcserverhelp.go (99%)
 rename server/{rpcserver => rpc}/rpcserverhelp_test.go (99%)
 rename server/{rpcserver => rpc}/rpcwebsocket.go (99%)

diff --git a/server/rpcserver/log.go b/server/rpc/log.go
similarity index 96%
rename from server/rpcserver/log.go
rename to server/rpc/log.go
index ae463c12e..1ef85a565 100644
--- a/server/rpcserver/log.go
+++ b/server/rpc/log.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package rpcserver
+package rpc
 
 import (
 	"github.com/btcsuite/btclog"
diff --git a/server/rpcserver/rpcadapters.go b/server/rpc/rpcadapters.go
similarity index 99%
rename from server/rpcserver/rpcadapters.go
rename to server/rpc/rpcadapters.go
index 2a76a7679..9bf3df66b 100644
--- a/server/rpcserver/rpcadapters.go
+++ b/server/rpc/rpcadapters.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package rpcserver
+package rpc
 
 import (
 	"sync/atomic"
diff --git a/server/rpcserver/rpcserver.go b/server/rpc/rpcserver.go
similarity index 99%
rename from server/rpcserver/rpcserver.go
rename to server/rpc/rpcserver.go
index cdea13c50..b6ff0e3b5 100644
--- a/server/rpcserver/rpcserver.go
+++ b/server/rpc/rpcserver.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package rpcserver
+package rpc
 
 import (
 	"bytes"
diff --git a/server/rpcserver/rpcserverhelp.go b/server/rpc/rpcserverhelp.go
similarity index 99%
rename from server/rpcserver/rpcserverhelp.go
rename to server/rpc/rpcserverhelp.go
index 0e3695a5c..21b181a42 100644
--- a/server/rpcserver/rpcserverhelp.go
+++ b/server/rpc/rpcserverhelp.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package rpcserver
+package rpc
 
 import (
 	"errors"
diff --git a/server/rpcserver/rpcserverhelp_test.go b/server/rpc/rpcserverhelp_test.go
similarity index 99%
rename from server/rpcserver/rpcserverhelp_test.go
rename to server/rpc/rpcserverhelp_test.go
index 2fb754ae3..5ac8bc7f9 100644
--- a/server/rpcserver/rpcserverhelp_test.go
+++ b/server/rpc/rpcserverhelp_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package rpcserver
+package rpc
 
 import (
 	"testing"
diff --git a/server/rpcserver/rpcwebsocket.go b/server/rpc/rpcwebsocket.go
similarity index 99%
rename from server/rpcserver/rpcwebsocket.go
rename to server/rpc/rpcwebsocket.go
index d03c99539..6ec083e9b 100644
--- a/server/rpcserver/rpcwebsocket.go
+++ b/server/rpc/rpcwebsocket.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package rpcserver
+package rpc
 
 import (
 	"bytes"
diff --git a/server/server.go b/server/server.go
index 013c575fa..03638bbdf 100644
--- a/server/server.go
+++ b/server/server.go
@@ -11,13 +11,13 @@ import (
 	"github.com/daglabs/btcd/mining"
 	"github.com/daglabs/btcd/mining/cpuminer"
 	"github.com/daglabs/btcd/server/p2p"
-	"github.com/daglabs/btcd/server/rpcserver"
+	"github.com/daglabs/btcd/server/rpc"
 	"github.com/daglabs/btcd/signal"
 )
 
 // Server is a wrapper for p2p server and rpc server
 type Server struct {
-	rpcServer   *rpcserver.Server
+	rpcServer   *rpc.Server
 	p2pServer   *p2p.Server
 	cpuminer    *cpuminer.CPUMiner
 	startupTime int64
@@ -119,7 +119,7 @@ func NewServer(listenAddrs []string, db database.DB, dagParams *dagconfig.Params
 
 	if !cfg.DisableRPC {
 
-		s.rpcServer, err = rpcserver.NewRPCServer(
+		s.rpcServer, err = rpc.NewRPCServer(
 			s.startupTime,
 			s.p2pServer,
 			db,