From 46f81abbd7bd72c3d5062e4d9b2e3231d80c45a0 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Fri, 10 Jul 2020 18:57:57 +0100
Subject: [PATCH] Move accounts into rove-server.internal

---
 Makefile                                                     | 2 +-
 {pkg/accounts => cmd/rove-server/internal}/accounts.go       | 2 +-
 {pkg/accounts => cmd/rove-server/internal}/accounts_test.go  | 2 +-
 cmd/rove-server/internal/server.go                           | 5 ++---
 .../rove-server/internal}/simpleAccountant.go                | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename {pkg/accounts => cmd/rove-server/internal}/accounts.go (98%)
 rename {pkg/accounts => cmd/rove-server/internal}/accounts_test.go (98%)
 rename {pkg/accounts => cmd/rove-server/internal}/simpleAccountant.go (99%)

diff --git a/Makefile b/Makefile
index b28ac4f..b36c19a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ VERSION := $(shell git describe --always --long --dirty --tags)
 build:
 	@echo Running no-output build
 	go mod download
-	go build -ldflags="-X 'github.com/mdiluz/rove/pkg/version.Version=${VERSION}'" ./...
+	go build -ldflags="-X 'github.com/mdiluz/rove/cmd/version.Version=${VERSION}'" ./...
 
 install:
 	@echo Installing to GOPATH
diff --git a/pkg/accounts/accounts.go b/cmd/rove-server/internal/accounts.go
similarity index 98%
rename from pkg/accounts/accounts.go
rename to cmd/rove-server/internal/accounts.go
index 69508c0..99362ad 100644
--- a/pkg/accounts/accounts.go
+++ b/cmd/rove-server/internal/accounts.go
@@ -1,4 +1,4 @@
-package accounts
+package internal
 
 // Accountant decribes something that stores accounts and account values
 type Accountant interface {
diff --git a/pkg/accounts/accounts_test.go b/cmd/rove-server/internal/accounts_test.go
similarity index 98%
rename from pkg/accounts/accounts_test.go
rename to cmd/rove-server/internal/accounts_test.go
index bd2416f..9e7891f 100644
--- a/pkg/accounts/accounts_test.go
+++ b/cmd/rove-server/internal/accounts_test.go
@@ -1,4 +1,4 @@
-package accounts
+package internal
 
 import (
 	"testing"
diff --git a/cmd/rove-server/internal/server.go b/cmd/rove-server/internal/server.go
index f633601..ad0c315 100644
--- a/cmd/rove-server/internal/server.go
+++ b/cmd/rove-server/internal/server.go
@@ -6,7 +6,6 @@ import (
 	"net"
 	"sync"
 
-	"github.com/mdiluz/rove/pkg/accounts"
 	"github.com/mdiluz/rove/pkg/persistence"
 	"github.com/mdiluz/rove/pkg/rove"
 	"github.com/mdiluz/rove/pkg/roveapi"
@@ -29,7 +28,7 @@ type Server struct {
 	world *rove.World
 
 	// Accountant
-	accountant accounts.Accountant
+	accountant Accountant
 
 	// gRPC server
 	netListener net.Listener
@@ -81,7 +80,7 @@ func NewServer(opts ...ServerOption) *Server {
 		persistence: EphemeralData,
 		schedule:    cron.New(),
 		world:       rove.NewWorld(32),
-		accountant:  accounts.NewSimpleAccountant(),
+		accountant:  NewSimpleAccountant(),
 	}
 
 	// Apply all options
diff --git a/pkg/accounts/simpleAccountant.go b/cmd/rove-server/internal/simpleAccountant.go
similarity index 99%
rename from pkg/accounts/simpleAccountant.go
rename to cmd/rove-server/internal/simpleAccountant.go
index 023fe2f..3168f30 100644
--- a/pkg/accounts/simpleAccountant.go
+++ b/cmd/rove-server/internal/simpleAccountant.go
@@ -1,4 +1,4 @@
-package accounts
+package internal
 
 import (
 	"fmt"