.github/workflows/lint.yml

@@ -0,0 +1,19 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+name: Test
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v4
+        with:
+          version: latest

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
           goarch: ${{ matrix.goarch }}
           overwrite: true
           pre_command: export CGO_ENABLED=0
-          ldflags: -s -w -X github.com/ditatompel/xmr-remote-nodes/internal/config.Version=${{github.ref_name}}
+          ldflags: -s -w -X xmr-remote-nodes/internal/config.Version=${{github.ref_name}}
           build_flags: -tags server
           project_path: .
           binary_name: server
@@ -53,7 +53,7 @@ jobs:
           goarch: ${{ matrix.goarch }}
           overwrite: true
           pre_command: export CGO_ENABLED=0
-          ldflags: -s -w -X github.com/ditatompel/xmr-remote-nodes/internal/config.Version=${{github.ref_name}}
+          ldflags: -s -w -X xmr-remote-nodes/internal/config.Version=${{github.ref_name}}
           binary_name: client
           project_path: .
           extra_files: LICENSE README.md

.github/workflows/test.yml

@@ -1,51 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-name: Test
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.x
-
-      - name: Cache Go modules
-        uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Run lint
-        uses: golangci/golangci-lint-action@v4
-        with:
-          version: latest
-
-      - name: setup NodeJS
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Build UI
-        run: make ui
-
-      - name: Run test
-        run: make test

Makefile

@@ -27,7 +27,7 @@ ifdef RELEASE_TAG
 endif
 # end modified rclone's Makefile
 
-BUILD_LDFLAGS := -s -w -X github.com/ditatompel/xmr-remote-nodes/internal/config.Version=$(TAG)
+BUILD_LDFLAGS := -s -w -X xmr-remote-nodes/internal/config.Version=$(TAG)
 
 # This called from air cmd (see .air.toml)
 .PHONY: dev
@@ -65,18 +65,6 @@ clean:
 	rm -rfv ./bin
 	rm -rf ./frontend/build
 
-.PHONY: lint
-lint:
-	golangci-lint run ./...
-
-.PHONY: test
-test:
-	go test -race -cover ./...
-
-.PHONY: bench
-bench:
-	go test ./... -bench=. -benchmem -run=^#
-
 # Deploying new binary file to server and probers host
 # The deploy-* command doesn't build the binary file, so you need to run `make build` first.
 # And make sure the inventory and deploy-*.yml file is properly configured.

README.md

@@ -1,6 +1,6 @@
 # XMR Remote Nodes
 
-[![Test](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/test.yml/badge.svg)](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/test.yml)
+[![Lint](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/lint.yml/badge.svg)](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/lint.yml)
 [![BUild](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/build.yml/badge.svg)](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/build.yml)
 [![Release Binaries](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/release.yml/badge.svg)](https://github.com/ditatompel/xmr-remote-nodes/actions/workflows/release.yml)
 

VERSION

@@ -1 +1 @@
-v0.0.4
+v0.0.3

cmd/client/probe.go

@@ -12,9 +12,8 @@ import (
 	"net/http"
 	"os"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/config"
-	"github.com/ditatompel/xmr-remote-nodes/internal/monero"
+	"xmr-remote-nodes/internal/config"
+	"xmr-remote-nodes/internal/monero"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/net/proxy"

cmd/cmd.go

@@ -2,9 +2,8 @@ package cmd
 
 import (
 	"os"
-
-	"github.com/ditatompel/xmr-remote-nodes/cmd/client"
-	"github.com/ditatompel/xmr-remote-nodes/internal/config"
+	"xmr-remote-nodes/cmd/client"
+	"xmr-remote-nodes/internal/config"
 
 	"github.com/spf13/cobra"
 )

cmd/server/cron.go

@@ -5,9 +5,8 @@ import (
 	"os"
 	"text/tabwriter"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/cron"
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
+	"xmr-remote-nodes/internal/cron"
+	"xmr-remote-nodes/internal/database"
 
 	"github.com/spf13/cobra"
 )

cmd/server/init.go

@@ -1,6 +1,6 @@
 package server
 
-import "github.com/ditatompel/xmr-remote-nodes/cmd"
+import "xmr-remote-nodes/cmd"
 
 func init() {
 	cmd.Root.AddCommand(serveCmd)

cmd/server/probers.go

@@ -9,9 +9,8 @@ import (
 	"strings"
 	"text/tabwriter"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
-	"github.com/ditatompel/xmr-remote-nodes/internal/monero"
+	"xmr-remote-nodes/internal/database"
+	"xmr-remote-nodes/internal/monero"
 
 	"github.com/spf13/cobra"
 )

cmd/server/serve.go

@@ -7,12 +7,11 @@ import (
 	"os/signal"
 	"syscall"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/frontend"
-	"github.com/ditatompel/xmr-remote-nodes/internal/config"
-	"github.com/ditatompel/xmr-remote-nodes/internal/cron"
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
-	"github.com/ditatompel/xmr-remote-nodes/internal/handler"
+	"xmr-remote-nodes/frontend"
+	"xmr-remote-nodes/handler"
+	"xmr-remote-nodes/internal/config"
+	"xmr-remote-nodes/internal/cron"
+	"xmr-remote-nodes/internal/database"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"

frontend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xmr-nodes-frontend",
-	"version": "v0.0.4",
+	"version": "v0.0.3",
 	"private": true,
 	"scripts": {
 		"dev": "VITE_API_URL=http://127.0.0.1:18901 vite dev --host 127.0.0.1",

go.mod

@@ -1,4 +1,4 @@
-module github.com/ditatompel/xmr-remote-nodes
+module xmr-remote-nodes
 
 go 1.22.2
 

handler/middlewares.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"github.com/ditatompel/xmr-remote-nodes/internal/monero"
+	"xmr-remote-nodes/internal/monero"
 
 	"github.com/gofiber/fiber/v2"
 )

handler/response.go

@@ -2,8 +2,7 @@ package handler
 
 import (
 	"strconv"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/monero"
+	"xmr-remote-nodes/internal/monero"
 
 	"github.com/gofiber/fiber/v2"
 )

internal/cron/cron.go

@@ -5,11 +5,15 @@ import (
 	"log/slog"
 	"math"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
+	"xmr-remote-nodes/internal/database"
 )
 
-type cronRepo struct {
+type CronRepository interface {
+	RunCronProcess(chan struct{})
+	Crons() ([]Cron, error)
+}
+
+type CronRepo struct {
 	db *database.DB
 }
 
@@ -28,11 +32,11 @@ type Cron struct {
 
 var rerunTimeout = 300
 
-func New() *cronRepo {
-	return &cronRepo{db: database.GetDB()}
+func New() CronRepository {
+	return &CronRepo{db: database.GetDB()}
 }
 
-func (r *cronRepo) RunCronProcess(c chan struct{}) {
+func (r *CronRepo) RunCronProcess(c chan struct{}) {
 	for {
 		select {
 		case <-time.After(60 * time.Second):
@@ -68,7 +72,7 @@ func (r *cronRepo) RunCronProcess(c chan struct{}) {
 	}
 }
 
-func (r *cronRepo) Crons() ([]Cron, error) {
+func (r *CronRepo) Crons() ([]Cron, error) {
 	var tasks []Cron
 	err := r.db.Select(&tasks, `
 		SELECT
@@ -87,7 +91,7 @@ func (r *cronRepo) Crons() ([]Cron, error) {
 	return tasks, err
 }
 
-func (r *cronRepo) queueList() ([]Cron, error) {
+func (r *CronRepo) queueList() ([]Cron, error) {
 	tasks := []Cron{}
 	query := `
 		SELECT
@@ -107,7 +111,7 @@ func (r *cronRepo) queueList() ([]Cron, error) {
 	return tasks, err
 }
 
-func (r *cronRepo) preRunTask(id int, lastRunTs int64) {
+func (r *CronRepo) preRunTask(id int, lastRunTs int64) {
 	query := `
 		UPDATE tbl_cron
 		SET
@@ -122,7 +126,7 @@ func (r *cronRepo) preRunTask(id int, lastRunTs int64) {
 	defer row.Close()
 }
 
-func (r *cronRepo) postRunTask(id int, nextRun int64, runtime float64) {
+func (r *CronRepo) postRunTask(id int, nextRun int64, runtime float64) {
 	query := `
 		UPDATE tbl_cron
 		SET
@@ -138,7 +142,7 @@ func (r *cronRepo) postRunTask(id int, nextRun int64, runtime float64) {
 	defer row.Close()
 }
 
-func (r *cronRepo) execCron(slug string) {
+func (r *CronRepo) execCron(slug string) {
 	switch slug {
 	case "delete_old_probe_logs":
 		slog.Info(fmt.Sprintf("[CRON] Start running task: %s", slug))
@@ -149,7 +153,7 @@ func (r *cronRepo) execCron(slug string) {
 	}
 }
 
-func (r *cronRepo) deleteOldProbeLogs() {
+func (r *CronRepo) deleteOldProbeLogs() {
 	// for now, we only delete stats older than 1 month +2 days
 	startTs := time.Now().AddDate(0, -1, -2).Unix()
 	query := `DELETE FROM tbl_probe_log WHERE date_checked < ?`
@@ -159,7 +163,7 @@ func (r *cronRepo) deleteOldProbeLogs() {
 	}
 }
 
-func (r *cronRepo) calculateMajorityFee() {
+func (r *CronRepo) calculateMajorityFee() {
 	netTypes := [3]string{"mainnet", "stagenet", "testnet"}
 	for _, net := range netTypes {
 		row, err := r.db.Query(`

internal/database/mysql.go

@@ -2,8 +2,7 @@ package database
 
 import (
 	"fmt"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/config"
+	"xmr-remote-nodes/internal/config"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"

internal/monero/monero.go

@@ -10,18 +10,28 @@ import (
 	"slices"
 	"strings"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
+	"xmr-remote-nodes/internal/database"
 
 	"github.com/jmoiron/sqlx/types"
 )
 
-type moneroRepo struct {
+type MoneroRepository interface {
+	Node(id int) (Node, error)
+	Add(protocol string, host string, port uint) error
+	Nodes(QueryNodes) (Nodes, error)
+	NetFees() []NetFee
+	Countries() ([]Countries, error)
+	GiveJob(acceptTor int) (Node, error)
+	ProcessJob(report ProbeReport, proberId int64) error
+	Logs(QueryLogs) (FetchLogs, error)
+}
+
+type MoneroRepo struct {
 	db *database.DB
 }
 
-func New() *moneroRepo {
-	return &moneroRepo{db: database.GetDB()}
+func New() MoneroRepository {
+	return &MoneroRepo{db: database.GetDB()}
 }
 
 // Node represents a single remote node
@@ -57,7 +67,7 @@ type Node struct {
 }
 
 // Get node from database by id
-func (r *moneroRepo) Node(id int) (Node, error) {
+func (r *MoneroRepo) Node(id int) (Node, error) {
 	var node Node
 	err := r.db.Get(&node, `SELECT * FROM tbl_node WHERE id = ?`, id)
 	if err != nil && err != sql.ErrNoRows {
@@ -151,7 +161,7 @@ type Nodes struct {
 }
 
 // Get nodes from database
-func (r *moneroRepo) Nodes(q QueryNodes) (Nodes, error) {
+func (r *MoneroRepo) Nodes(q QueryNodes) (Nodes, error) {
 	args, where, sortBy, sortDirection := q.toSQL()
 
 	var nodes Nodes
@@ -187,7 +197,7 @@ func (r *moneroRepo) Nodes(q QueryNodes) (Nodes, error) {
 	return nodes, err
 }
 
-func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
+func (repo *MoneroRepo) Add(protocol string, hostname string, port uint) error {
 	if protocol != "http" && protocol != "https" {
 		return errors.New("Invalid protocol, must one of or HTTP/HTTPS")
 	}
@@ -222,7 +232,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
 		ip = hostIp.String()
 	}
 
-	row, err := r.db.Query(`
+	row, err := repo.db.Query(`
 		SELECT
 			id
 		FROM
@@ -241,7 +251,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
 		return errors.New("Node already monitored")
 	}
 	statusDb, _ := json.Marshal([5]int{2, 2, 2, 2, 2})
-	_, err = r.db.Exec(`
+	_, err = repo.db.Exec(`
 		INSERT INTO tbl_node (
 			protocol,
 			hostname,
@@ -285,7 +295,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
 	return nil
 }
 
-func (r *moneroRepo) Delete(id uint) error {
+func (r *MoneroRepo) Delete(id uint) error {
 	if _, err := r.db.Exec(`DELETE FROM tbl_node WHERE id = ?`, id); err != nil {
 		return err
 	}
@@ -303,7 +313,7 @@ type NetFee struct {
 }
 
 // Get majority net fee from table tbl_fee
-func (r *moneroRepo) NetFees() []NetFee {
+func (r *MoneroRepo) NetFees() []NetFee {
 	var netFees []NetFee
 	err := r.db.Select(&netFees, `
 		SELECT
@@ -327,7 +337,7 @@ type Countries struct {
 }
 
 // Get list of countries (count by nodes)
-func (r *moneroRepo) Countries() ([]Countries, error) {
+func (r *MoneroRepo) Countries() ([]Countries, error) {
 	var c []Countries
 	err := r.db.Select(&c, `
 		SELECT

internal/monero/monero_test.go

@@ -5,9 +5,8 @@ import (
 	"reflect"
 	"strconv"
 	"testing"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/config"
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
+	"xmr-remote-nodes/internal/config"
+	"xmr-remote-nodes/internal/database"
 )
 
 var testMySQL = true

internal/monero/prober.go

@@ -4,15 +4,22 @@ import (
 	"fmt"
 	"slices"
 	"strings"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/database"
+	"xmr-remote-nodes/internal/database"
 
 	"github.com/google/uuid"
 )
 
 const ProberAPIKey = "X-Prober-Api-Key" // HTTP header key
 
-type proberRepo struct {
+type ProberRepository interface {
+	Add(name string) (Prober, error)
+	Edit(id int, name string) error
+	Probers(QueryProbers) ([]Prober, error)
+	CheckAPI(key string) (Prober, error)
+	Delete(id int) error
+}
+
+type ProberRepo struct {
 	db *database.DB
 }
 
@@ -26,12 +33,12 @@ type Prober struct {
 // Initializes a new ProberRepository
 //
 // NOTE: This "prober" is different with "probe" which is used to fetch a new job
-func NewProber() *proberRepo {
-	return &proberRepo{db: database.GetDB()}
+func NewProber() ProberRepository {
+	return &ProberRepo{db: database.GetDB()}
 }
 
 // Add a new prober machine
-func (r *proberRepo) Add(name string) (Prober, error) {
+func (r *ProberRepo) Add(name string) (Prober, error) {
 	apiKey := uuid.New()
 	query := `
 		INSERT INTO tbl_prober (
@@ -51,7 +58,7 @@ func (r *proberRepo) Add(name string) (Prober, error) {
 }
 
 // Edit an existing prober
-func (r *proberRepo) Edit(id int, name string) error {
+func (r *ProberRepo) Edit(id int, name string) error {
 	query := `UPDATE tbl_prober SET name = ? WHERE id = ?`
 	res, err := r.db.Exec(query, name, id)
 	if err != nil {
@@ -68,7 +75,7 @@ func (r *proberRepo) Edit(id int, name string) error {
 }
 
 // Delete an existing prober
-func (r *proberRepo) Delete(id int) error {
+func (r *ProberRepo) Delete(id int) error {
 	res, err := r.db.Exec(`DELETE FROM tbl_prober WHERE id = ?`, id)
 	if err != nil {
 		return err
@@ -112,7 +119,7 @@ func (q QueryProbers) toSQL() (args []interface{}, where, sortBy, sortDirection
 	return args, where, sortBy, sortDirection
 }
 
-func (r *proberRepo) Probers(q QueryProbers) ([]Prober, error) {
+func (r *ProberRepo) Probers(q QueryProbers) ([]Prober, error) {
 	args, where, sortBy, sortDirection := q.toSQL()
 
 	var probers []Prober
@@ -145,7 +152,7 @@ func (r *proberRepo) Probers(q QueryProbers) ([]Prober, error) {
 	return probers, nil
 }
 
-func (r *proberRepo) CheckAPI(key string) (Prober, error) {
+func (r *ProberRepo) CheckAPI(key string) (Prober, error) {
 	var p Prober
 	query := `
 		SELECT

internal/monero/report.go

@@ -9,8 +9,7 @@ import (
 	"slices"
 	"strings"
 	"time"
-
-	"github.com/ditatompel/xmr-remote-nodes/internal/geo"
+	"xmr-remote-nodes/internal/geo"
 )
 
 type QueryLogs struct {
@@ -78,7 +77,7 @@ type FetchLogs struct {
 }
 
 // Logs returns list of fetched log result for given query
-func (r *moneroRepo) Logs(q QueryLogs) (FetchLogs, error) {
+func (r *MoneroRepo) Logs(q QueryLogs) (FetchLogs, error) {
 	args, where, sortBy, sortDirection := q.toSQL()
 
 	var fetchLogs FetchLogs
@@ -108,7 +107,7 @@ func (r *moneroRepo) Logs(q QueryLogs) (FetchLogs, error) {
 }
 
 // GiveJob returns node that should be probed for the next time
-func (r *moneroRepo) GiveJob(acceptTor int) (Node, error) {
+func (r *MoneroRepo) GiveJob(acceptTor int) (Node, error) {
 	args := []interface{}{}
 	wq := []string{}
 	where := ""
@@ -196,7 +195,7 @@ func (p *ProbeReport) parseStatuses() string {
 }
 
 // Process report data from probers
-func (r *moneroRepo) ProcessJob(report ProbeReport, proberId int64) error {
+func (r *MoneroRepo) ProcessJob(report ProbeReport, proberId int64) error {
 	if report.Node.ID == 0 {
 		return errors.New("Invalid node")
 	}

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/ditatompel/xmr-remote-nodes/cmd"
+	"xmr-remote-nodes/cmd"
 )
 
 func main() {

server.go

@@ -2,4 +2,4 @@
 
 package main
 
-import _ "github.com/ditatompel/xmr-remote-nodes/cmd/server"
+import _ "xmr-remote-nodes/cmd/server"