Skip to content

Commit

Permalink
chore: update module name to v2 (#364)
Browse files Browse the repository at this point in the history
* chore: update module name to v2

* chore: update mockery packages
  • Loading branch information
jackstar12 authored Dec 28, 2024
1 parent 87afb46 commit 84c6671
Show file tree
Hide file tree
Showing 79 changed files with 309 additions and 309 deletions.
6 changes: 3 additions & 3 deletions .mockery.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
with-expecter: True
filename: "{{ .InterfaceName }}_mock.go"
packages:
github.com/BoltzExchange/boltz-client/onchain:
github.com/BoltzExchange/boltz-client/v2/onchain:
interfaces:
Wallet:
TxProvider:
BlockProvider:
github.com/BoltzExchange/boltz-client/autoswap:
github.com/BoltzExchange/boltz-client/v2/autoswap:
config:
dir: autoswap
inpackage: True
interfaces:
RpcProvider:
github.com/BoltzExchange/boltz-client/lightning:
github.com/BoltzExchange/boltz-client/v2/lightning:
interfaces:
LightningNode:
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ GDK_VERSION = 0.73.3
GO_VERSION := 1.23.0
RUST_VERSION := 1.82.0

PKG_BOLTZD := github.com/BoltzExchange/boltz-client/cmd/boltzd
PKG_BOLTZ_CLI := github.com/BoltzExchange/boltz-client/cmd/boltzcli
PKG_BOLTZD := github.com/BoltzExchange/boltz-client/v2/cmd/boltzd
PKG_BOLTZ_CLI := github.com/BoltzExchange/boltz-client/v2/cmd/boltzcli

GO_BIN := ${GOPATH}/bin

Expand Down
14 changes: 7 additions & 7 deletions autoswap/RpcProvider_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions autoswap/autoswap.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/lightning"
"github.com/BoltzExchange/boltz-client/logger"
"github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/utils"
"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/BurntSushi/toml"
"google.golang.org/protobuf/encoding/protojson"
"os"
Expand Down
8 changes: 4 additions & 4 deletions autoswap/autoswap_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/onchain"
"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"
"os"
"testing"

Expand Down
4 changes: 2 additions & 2 deletions autoswap/balance.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/utils"
"github.com/BoltzExchange/boltz-client/v2/boltz"
"github.com/BoltzExchange/boltz-client/v2/utils"
)

type Balance struct {
Expand Down
6 changes: 3 additions & 3 deletions autoswap/budget.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package autoswap

import (
"errors"
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/v2/boltz"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
"time"

"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/v2/database"
)

type Budget struct {
Expand Down
14 changes: 7 additions & 7 deletions autoswap/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package autoswap
import (
"errors"
"fmt"
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/serializers"
"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/logger"
"github.com/BoltzExchange/boltz-client/onchain"
"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"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"sync"
Expand Down
14 changes: 7 additions & 7 deletions autoswap/chain_test.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/database"
onchainmock "github.com/BoltzExchange/boltz-client/mocks/github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/test"
"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/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"google.golang.org/grpc/codes"
Expand Down
8 changes: 4 additions & 4 deletions autoswap/config_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/v2/database"
"github.com/BoltzExchange/boltz-client/v2/onchain"
"testing"

"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/v2/boltz"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
"github.com/stretchr/testify/require"
)

Expand Down
16 changes: 8 additions & 8 deletions autoswap/lightning.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ package autoswap
import (
"errors"
"fmt"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/serializers"
"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/onchain"
"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"
"google.golang.org/protobuf/proto"
"slices"
"sync"
"time"

"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/lightning"
"github.com/BoltzExchange/boltz-client/logger"
"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"
)

type LightningSwapper = swapper[*LightningConfig]
Expand Down
14 changes: 7 additions & 7 deletions autoswap/lightning_test.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/test"
"github.com/BoltzExchange/boltz-client/v2/onchain"
"github.com/BoltzExchange/boltz-client/v2/test"
"testing"
"time"

"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/database"
"github.com/BoltzExchange/boltz-client/lightning"
"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/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/fieldmaskpb"
Expand Down
6 changes: 3 additions & 3 deletions autoswap/recommendation.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/v2/boltz"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
"math"

"github.com/BoltzExchange/boltz-client/utils"
"github.com/BoltzExchange/boltz-client/v2/utils"
)

type checks struct {
Expand Down
2 changes: 1 addition & 1 deletion autoswap/recommendation_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
"github.com/stretchr/testify/require"
"testing"
)
Expand Down
8 changes: 4 additions & 4 deletions autoswap/rpc.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package autoswap

import (
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/boltzrpc/serializers"
"github.com/BoltzExchange/boltz-client/lightning"
"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"
)

func serializeLightningChannel(channel *lightning.LightningChannel) *boltzrpc.LightningChannel {
Expand Down
8 changes: 4 additions & 4 deletions autoswap/strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package autoswap
import (
"math"

"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/lightning"
"github.com/BoltzExchange/boltz-client/logger"
"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/boltz"
"github.com/BoltzExchange/boltz-client/v2/boltz"
)

type Strategy = func(channels []*lightning.LightningChannel) []*LightningRecommendation
Expand Down
2 changes: 1 addition & 1 deletion autoswap/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package autoswap

import (
"errors"
"github.com/BoltzExchange/boltz-client/lightning"
"github.com/BoltzExchange/boltz-client/v2/lightning"
"slices"

"github.com/mennanov/fmutils"
Expand Down
2 changes: 1 addition & 1 deletion boltz/ws.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"slices"
"time"

"github.com/BoltzExchange/boltz-client/logger"
"github.com/BoltzExchange/boltz-client/v2/logger"
"github.com/gorilla/websocket"
"github.com/mitchellh/mapstructure"
)
Expand Down
2 changes: 1 addition & 1 deletion boltzrpc/autoswaprpc/autoswaprpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion boltzrpc/client/autoswap.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package client
import (
"errors"
"fmt"
"github.com/BoltzExchange/boltz-client/boltzrpc/autoswaprpc"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc/autoswaprpc"
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/types/known/fieldmaskpb"
Expand Down
2 changes: 1 addition & 1 deletion boltzrpc/client/client.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
"github.com/golang/protobuf/ptypes/empty"
)

Expand Down
6 changes: 3 additions & 3 deletions boltzrpc/serializers/utils.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package serializers

import (
"github.com/BoltzExchange/boltz-client/boltz"
"github.com/BoltzExchange/boltz-client/boltzrpc"
"github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/v2/boltz"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc"
"github.com/BoltzExchange/boltz-client/v2/onchain"
)

func ParseCurrency(grpcCurrency *boltzrpc.Currency) boltz.Currency {
Expand Down
8 changes: 4 additions & 4 deletions cln/cln.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strconv"
"time"

"github.com/BoltzExchange/boltz-client/logger"
"github.com/BoltzExchange/boltz-client/v2/logger"

"github.com/BoltzExchange/boltz-client/cln/protos"
"github.com/BoltzExchange/boltz-client/lightning"
"github.com/BoltzExchange/boltz-client/onchain"
"github.com/BoltzExchange/boltz-client/v2/cln/protos"
"github.com/BoltzExchange/boltz-client/v2/lightning"
"github.com/BoltzExchange/boltz-client/v2/onchain"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/boltzcli/boltzcli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"path"
"strings"

"github.com/BoltzExchange/boltz-client/boltzrpc/client"
"github.com/BoltzExchange/boltz-client/build"
"github.com/BoltzExchange/boltz-client/utils"
"github.com/BoltzExchange/boltz-client/v2/boltzrpc/client"
"github.com/BoltzExchange/boltz-client/v2/build"
"github.com/BoltzExchange/boltz-client/v2/utils"
"github.com/urfave/cli/v2"
"google.golang.org/grpc/status"
)
Expand Down
Loading

0 comments on commit 84c6671

Please sign in to comment.