refactor: package structure (#366)

BoltzExchange · Jan 7, 2025 · 2fac4e2 · 2fac4e2
1 parent 84c6671
commit 2fac4e2
Show file tree

Hide file tree

Showing 166 changed files with 318 additions and 317 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ boltzcli
 !cmd/boltzd
 !cmd/boltzcli
 bin/
-onchain/wallet/lib/
+internal/onchain/wallet/lib/
 boltz-client-*.tar.gz
 boltz-client-manifest-*.txt
 
@@ -26,9 +26,9 @@ vendor/
 
 # Config, database, log, certificate and macaroon files
 boltz.toml
-!rpcserver/test/boltz.toml
-rpcserver/test/wallet
-rpcserver/test/autoswap.toml
+!internal/rpcserver/test/boltz.toml
+internal/rpcserver/test/wallet
+internal/rpcserver/test/autoswap.toml
 boltz.db
 boltz.log
 tls.key

diff --git a/.mockery.yaml b/.mockery.yaml
@@ -1,17 +1,18 @@
 with-expecter: True
 filename: "{{ .InterfaceName }}_mock.go"
+dir: ./internal/mocks/{{.PackageName}}
 packages:
-  github.com/BoltzExchange/boltz-client/v2/onchain:
+  github.com/BoltzExchange/boltz-client/v2/internal/onchain:
     interfaces:
       Wallet:
       TxProvider:
       BlockProvider:
-  github.com/BoltzExchange/boltz-client/v2/autoswap:
+  github.com/BoltzExchange/boltz-client/v2/internal/autoswap:
     config:
-      dir: autoswap
+      dir: ./internal/autoswap
       inpackage: True
     interfaces:
       RpcProvider:
-  github.com/BoltzExchange/boltz-client/v2/lightning:
+  github.com/BoltzExchange/boltz-client/v2/internal/lightning:
     interfaces:
       LightningNode:
diff --git a/Makefile b/Makefile
@@ -81,7 +81,7 @@ restart-regtest: download-regtest
 
 build-bolt12:
 	@$(call print, "Building bolt12")
-	cd lightning/lib/bolt12 && cargo build --release
+	cd internal/lightning/lib/bolt12 && cargo build --release
 
 build: download-gdk build-bolt12
 	@$(call print, "Building boltz-client")
@@ -117,10 +117,10 @@ deps: submodules
 		find secp256k1-zkp -type f -name "*.h" -print0 | xargs -0 sed -i '/include/!s/secp256k1/go_secp256k1/g'
 
 download-gdk:
-ifeq ("$(wildcard onchain/wallet/lib/libgreen_gdk.so)","")
+ifeq ("$(wildcard internal/onchain/wallet/lib/libgreen_gdk.so)","")
 	@$(call print, "Downloading gdk library")
 	@container_id=$$(docker create "boltz/gdk-ubuntu:$(GDK_VERSION)" true); \
-	docker cp "$$container_id:/" onchain/wallet/lib/ && \
+	docker cp "$$container_id:/" internal/onchain/wallet/lib/ && \
 	docker rm "$$container_id";
 endif
 

diff --git a/cmd/boltzcli/boltzcli.go b/cmd/boltzcli/boltzcli.go
@@ -7,9 +7,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/client"
-	"github.com/BoltzExchange/boltz-client/v2/build"
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/build"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/client"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/grpc/status"
 )

diff --git a/cmd/boltzcli/commands.go b/cmd/boltzcli/commands.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/client"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/serializers"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/client"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/serializers"
 	"google.golang.org/protobuf/proto"
 	"io"
 	"os"
@@ -21,10 +21,10 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
 	"github.com/BurntSushi/toml"
 	"github.com/briandowns/spinner"
 	"github.com/fatih/color"

diff --git a/cmd/boltzcli/utils.go b/cmd/boltzcli/utils.go
@@ -3,9 +3,9 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 	"os"
 	"regexp"
 	"strconv"

diff --git a/cmd/boltzd/boltzd.go b/cmd/boltzd/boltzd.go
@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/BoltzExchange/boltz-client/v2/build"
-	"github.com/BoltzExchange/boltz-client/v2/config"
-	"github.com/BoltzExchange/boltz-client/v2/logger"
-	"github.com/BoltzExchange/boltz-client/v2/rpcserver"
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/build"
+	"github.com/BoltzExchange/boltz-client/v2/internal/config"
+	"github.com/BoltzExchange/boltz-client/v2/internal/logger"
+	"github.com/BoltzExchange/boltz-client/v2/internal/rpcserver"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
 	"os"
 	"os/signal"
 	"runtime"

diff --git a/autoswap/RpcProvider_mock.go → internal/autoswap/RpcProvider_mock.go b/autoswap/RpcProvider_mock.go → internal/autoswap/RpcProvider_mock.go
diff --git a/autoswap/autoswap.go → internal/autoswap/autoswap.go b/autoswap/autoswap.go → internal/autoswap/autoswap.go
@@ -4,14 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	"github.com/BoltzExchange/boltz-client/v2/lightning"
-	"github.com/BoltzExchange/boltz-client/v2/logger"
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/internal/logger"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
 	"github.com/BurntSushi/toml"
 	"google.golang.org/protobuf/encoding/protojson"
 	"os"

diff --git a/autoswap/autoswap_test.go → internal/autoswap/autoswap_test.go b/autoswap/autoswap_test.go → internal/autoswap/autoswap_test.go
@@ -1,10 +1,10 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 	"os"
 	"testing"
 

diff --git a/autoswap/balance.go → internal/autoswap/balance.go b/autoswap/balance.go → internal/autoswap/balance.go
@@ -1,8 +1,8 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
 )
 
 type Balance struct {

diff --git a/autoswap/budget.go → internal/autoswap/budget.go b/autoswap/budget.go → internal/autoswap/budget.go
@@ -2,11 +2,11 @@ package autoswap
 
 import (
 	"errors"
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 	"time"
 
-	"github.com/BoltzExchange/boltz-client/v2/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
 )
 
 type Budget struct {

diff --git a/autoswap/chain.go → internal/autoswap/chain.go b/autoswap/chain.go → internal/autoswap/chain.go
@@ -3,13 +3,13 @@ package autoswap
 import (
 	"errors"
 	"fmt"
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/serializers"
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	"github.com/BoltzExchange/boltz-client/v2/logger"
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/logger"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/serializers"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"sync"

diff --git a/autoswap/chain_test.go → internal/autoswap/chain_test.go b/autoswap/chain_test.go → internal/autoswap/chain_test.go
@@ -1,13 +1,13 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	onchainmock "github.com/BoltzExchange/boltz-client/v2/mocks/github.com/BoltzExchange/boltz-client/v2/onchain"
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
-	"github.com/BoltzExchange/boltz-client/v2/test"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	onchainmock "github.com/BoltzExchange/boltz-client/v2/internal/mocks/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/test"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"

diff --git a/autoswap/config_test.go → internal/autoswap/config_test.go b/autoswap/config_test.go → internal/autoswap/config_test.go
@@ -1,12 +1,12 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
 	"testing"
 
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/autoswap/lightning.go → internal/autoswap/lightning.go b/autoswap/lightning.go → internal/autoswap/lightning.go
@@ -3,19 +3,19 @@ package autoswap
 import (
 	"errors"
 	"fmt"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/serializers"
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/serializers"
 	"google.golang.org/protobuf/proto"
 	"slices"
 	"sync"
 	"time"
 
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/lightning"
-	"github.com/BoltzExchange/boltz-client/v2/logger"
+	"github.com/BoltzExchange/boltz-client/v2/internal/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/internal/logger"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 )
 
 type LightningSwapper = swapper[*LightningConfig]

diff --git a/autoswap/lightning_test.go → internal/autoswap/lightning_test.go b/autoswap/lightning_test.go → internal/autoswap/lightning_test.go
@@ -1,16 +1,16 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/onchain"
-	"github.com/BoltzExchange/boltz-client/v2/test"
+	"github.com/BoltzExchange/boltz-client/v2/internal/onchain"
+	"github.com/BoltzExchange/boltz-client/v2/internal/test"
 	"testing"
 	"time"
 
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/database"
-	"github.com/BoltzExchange/boltz-client/v2/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/internal/database"
+	"github.com/BoltzExchange/boltz-client/v2/internal/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"

diff --git a/autoswap/recommendation.go → internal/autoswap/recommendation.go b/autoswap/recommendation.go → internal/autoswap/recommendation.go
@@ -1,11 +1,11 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 	"math"
 
-	"github.com/BoltzExchange/boltz-client/v2/utils"
+	"github.com/BoltzExchange/boltz-client/v2/internal/utils"
 )
 
 type checks struct {

diff --git a/autoswap/recommendation_test.go → internal/autoswap/recommendation_test.go b/autoswap/recommendation_test.go → internal/autoswap/recommendation_test.go
@@ -1,7 +1,7 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
 	"github.com/stretchr/testify/require"
 	"testing"
 )

diff --git a/autoswap/rpc.go → internal/autoswap/rpc.go b/autoswap/rpc.go → internal/autoswap/rpc.go
@@ -1,10 +1,10 @@
 package autoswap
 
 import (
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/serializers"
-	"github.com/BoltzExchange/boltz-client/v2/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/internal/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/serializers"
 )
 
 func serializeLightningChannel(channel *lightning.LightningChannel) *boltzrpc.LightningChannel {

diff --git a/autoswap/strategy.go → internal/autoswap/strategy.go b/autoswap/strategy.go → internal/autoswap/strategy.go
@@ -3,11 +3,11 @@ package autoswap
 import (
 	"math"
 
-	"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
-	"github.com/BoltzExchange/boltz-client/v2/lightning"
-	"github.com/BoltzExchange/boltz-client/v2/logger"
+	"github.com/BoltzExchange/boltz-client/v2/internal/lightning"
+	"github.com/BoltzExchange/boltz-client/v2/internal/logger"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltzrpc/autoswaprpc"
 
-	"github.com/BoltzExchange/boltz-client/v2/boltz"
+	"github.com/BoltzExchange/boltz-client/v2/pkg/boltz"
 )
 
 type Strategy = func(channels []*lightning.LightningChannel) []*LightningRecommendation