rename module

YusukeShimizu · Apr 18, 2022 · 41d9b35 · 41d9b35
1 parent 1955cea
commit 41d9b35
Show file tree

Hide file tree

Showing 47 changed files with 137 additions and 127 deletions.
diff --git a/Makefile b/Makefile
@@ -27,19 +27,19 @@ test-integration: build-with-fast-test
 .PHONY: test-integration
 
 test-bitcoin-cln: build-with-fast-test
-	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_ClnCln_Bitcoin_SwapOut|Test_ClnCln_Bitcoin_SwapIn|Test_ClnLnd_Bitcoin_SwapOut|Test_ClnLnd_Bitcoin_SwapIn)$'' github.com/sputn1ck/peerswap/test
+	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_ClnCln_Bitcoin_SwapOut|Test_ClnCln_Bitcoin_SwapIn|Test_ClnLnd_Bitcoin_SwapOut|Test_ClnLnd_Bitcoin_SwapIn)$'' github.com/elementsproject/peerswap/test
 .PHONY: test-bitcoin-cln
 
 test-bitcoin-lnd: build-with-fast-test
-	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_LndLnd_Bitcoin_SwapOut|Test_LndLnd_Bitcoin_SwapIn|Test_LndCln_Bitcoin_SwapOut|Test_LndCln_Bitcoin_SwapIn)$'' github.com/sputn1ck/peerswap/test
+	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_LndLnd_Bitcoin_SwapOut|Test_LndLnd_Bitcoin_SwapIn|Test_LndCln_Bitcoin_SwapOut|Test_LndCln_Bitcoin_SwapIn)$'' github.com/elementsproject/peerswap/test
 .PHONY: test-liquid-lnd
 
 test-liquid-cln: build-with-fast-test
-	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_ClnCln_Liquid_SwapOut|Test_ClnCln_Liquid_SwapIn|Test_ClnLnd_Liquid_SwapOut|Test_ClnLnd_Liquid_SwapIn)$'' github.com/sputn1ck/peerswap/test
+	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_ClnCln_Liquid_SwapOut|Test_ClnCln_Liquid_SwapIn|Test_ClnLnd_Liquid_SwapOut|Test_ClnLnd_Liquid_SwapIn)$'' github.com/elementsproject/peerswap/test
 .PHONY: test-liquid-cln
 
 test-liquid-lnd: build-with-fast-test
-	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_LndLnd_Liquid_SwapOut|Test_LndLnd_Liquid_SwapIn|Test_LndCln_Liquid_SwapOut|Test_LndCln_Liquid_SwapIn)$'' github.com/sputn1ck/peerswap/test
+	RUN_INTEGRATION_TESTS=1 PAYMENT_RETRY_TIME=$(PAYMENT_RETRY_TIME) PEERSWAP_TEST_FILTER=$(PEERSWAP_TEST_FILTER) go test -tags dev -tags fast_test -timeout=30m -v -run '^(Test_LndLnd_Liquid_SwapOut|Test_LndLnd_Liquid_SwapIn|Test_LndCln_Liquid_SwapOut|Test_LndCln_Liquid_SwapIn)$'' github.com/elementsproject/peerswap/test
 .PHONY: test-liquid-lnd
 
 lnd-release:

diff --git a/clightning/clightning.go b/clightning/clightning.go
@@ -13,20 +13,20 @@ import (
 	"sync"
 	"time"
 
-	"github.com/sputn1ck/peerswap/log"
+	"github.com/elementsproject/peerswap/log"
 
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/elementsproject/peerswap/onchain"
 	"github.com/sputn1ck/glightning/gbitcoin"
-	"github.com/sputn1ck/peerswap/onchain"
 
+	"github.com/elementsproject/peerswap/lightning"
+	"github.com/elementsproject/peerswap/messages"
+	"github.com/elementsproject/peerswap/poll"
+	"github.com/elementsproject/peerswap/swap"
+	"github.com/elementsproject/peerswap/wallet"
 	"github.com/sputn1ck/glightning/gelements"
 	"github.com/sputn1ck/glightning/glightning"
 	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/sputn1ck/peerswap/lightning"
-	"github.com/sputn1ck/peerswap/messages"
-	"github.com/sputn1ck/peerswap/poll"
-	"github.com/sputn1ck/peerswap/swap"
-	"github.com/sputn1ck/peerswap/wallet"
 )
 
 var methods = []peerswaprpcMethod{

diff --git a/clightning/clightning_commands.go b/clightning/clightning_commands.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sputn1ck/peerswap/log"
+	"github.com/elementsproject/peerswap/log"
 
+	"github.com/elementsproject/peerswap/policy"
+	"github.com/elementsproject/peerswap/swap"
 	"github.com/sputn1ck/glightning/glightning"
 	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/sputn1ck/peerswap/policy"
-	"github.com/sputn1ck/peerswap/swap"
 )
 
 type SwapCanceledError string

diff --git a/clightning/clightning_dev.go b/clightning/clightning_dev.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/elementsproject/peerswap/lightning"
 	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/sputn1ck/peerswap/lightning"
 )
 
 var (

diff --git a/clightning/clightning_wallet.go b/clightning/clightning_wallet.go
@@ -5,10 +5,11 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+
+	"github.com/elementsproject/peerswap/lightning"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/swap"
 	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/peerswap/lightning"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/swap"
 )
 
 func (cl *ClightningClient) CreateOpeningTransaction(swapParams *swap.OpeningParams) (unpreparedTxHex string, fee uint64, vout uint32, err error) {

diff --git a/cmd/peerswap-plugin/main.go b/cmd/peerswap-plugin/main.go
@@ -12,25 +12,25 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/sputn1ck/peerswap/log"
-	"github.com/sputn1ck/peerswap/version"
+	"github.com/elementsproject/peerswap/log"
+	"github.com/elementsproject/peerswap/version"
 
 	"github.com/vulpemventures/go-elements/network"
 
 	"strings"
 
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/elementsproject/peerswap/clightning"
+	"github.com/elementsproject/peerswap/messages"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/policy"
+	"github.com/elementsproject/peerswap/poll"
+	"github.com/elementsproject/peerswap/swap"
+	"github.com/elementsproject/peerswap/txwatcher"
+	"github.com/elementsproject/peerswap/wallet"
 	"github.com/sputn1ck/glightning/gbitcoin"
 	"github.com/sputn1ck/glightning/gelements"
 	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/peerswap/clightning"
-	"github.com/sputn1ck/peerswap/messages"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/policy"
-	"github.com/sputn1ck/peerswap/poll"
-	"github.com/sputn1ck/peerswap/swap"
-	"github.com/sputn1ck/peerswap/txwatcher"
-	"github.com/sputn1ck/peerswap/wallet"
 	"go.etcd.io/bbolt"
 )
 

diff --git a/cmd/peerswaplnd/peerswapd/main.go b/cmd/peerswaplnd/peerswapd/main.go
@@ -16,27 +16,27 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/sputn1ck/peerswap/log"
-	"github.com/sputn1ck/peerswap/version"
+	"github.com/elementsproject/peerswap/log"
+	"github.com/elementsproject/peerswap/version"
 
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/elementsproject/peerswap/cmd/peerswaplnd"
+	lnd2 "github.com/elementsproject/peerswap/lnd"
+	"github.com/elementsproject/peerswap/messages"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/peerswaprpc"
+	"github.com/elementsproject/peerswap/policy"
+	"github.com/elementsproject/peerswap/poll"
+	"github.com/elementsproject/peerswap/swap"
+	"github.com/elementsproject/peerswap/txwatcher"
+	"github.com/elementsproject/peerswap/wallet"
 	"github.com/jessevdk/go-flags"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"github.com/sputn1ck/glightning/gbitcoin"
 	"github.com/sputn1ck/glightning/gelements"
-	"github.com/sputn1ck/peerswap/cmd/peerswaplnd"
-	lnd2 "github.com/sputn1ck/peerswap/lnd"
-	"github.com/sputn1ck/peerswap/messages"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/peerswaprpc"
-	"github.com/sputn1ck/peerswap/policy"
-	"github.com/sputn1ck/peerswap/poll"
-	"github.com/sputn1ck/peerswap/swap"
-	"github.com/sputn1ck/peerswap/txwatcher"
-	"github.com/sputn1ck/peerswap/wallet"
 	"github.com/vulpemventures/go-elements/network"
 	"go.etcd.io/bbolt"
 	"google.golang.org/grpc"

diff --git a/cmd/peerswaplnd/pscli/main.go b/cmd/peerswaplnd/pscli/main.go
@@ -6,9 +6,9 @@ import (
 	log2 "log"
 	"os"
 
+	"github.com/elementsproject/peerswap/peerswaprpc"
 	"github.com/lightninglabs/protobuf-hex-display/jsonpb"
 	"github.com/lightninglabs/protobuf-hex-display/proto"
-	"github.com/sputn1ck/peerswap/peerswaprpc"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
 )

diff --git a/contrib/stateparser.go b/contrib/stateparser.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/sputn1ck/peerswap/swap"
+	"github.com/elementsproject/peerswap/swap"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/sputn1ck/peerswap
+module github.com/elementsproject/peerswap
 
 go 1.16
 

diff --git a/lnd/lnd.go b/lnd/lnd.go
@@ -5,21 +5,22 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/peerswap/log"
 	"io/ioutil"
 	"time"
 
+	"github.com/elementsproject/peerswap/log"
+
+	"github.com/elementsproject/peerswap/lightning"
+	"github.com/elementsproject/peerswap/messages"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/poll"
+	"github.com/elementsproject/peerswap/swap"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/macaroons"
-	"github.com/sputn1ck/peerswap/lightning"
-	"github.com/sputn1ck/peerswap/messages"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/poll"
-	"github.com/sputn1ck/peerswap/swap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"gopkg.in/macaroon.v2"

diff --git a/lnd/lnd_test.go b/lnd/lnd_test.go
@@ -16,16 +16,16 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/psbt"
+	"github.com/elementsproject/peerswap/lightning"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/swap"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"github.com/sputn1ck/glightning/gbitcoin"
 	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/peerswap/lightning"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/swap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"gopkg.in/macaroon.v2"

diff --git a/lnd/lnd_txwatcher.go b/lnd/lnd_txwatcher.go
@@ -3,11 +3,12 @@ package lnd
 import (
 	"context"
 	"encoding/hex"
+
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/elementsproject/peerswap/log"
+	"github.com/elementsproject/peerswap/onchain"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
-	"github.com/sputn1ck/peerswap/log"
-	"github.com/sputn1ck/peerswap/onchain"
 )
 
 type LndTxWatcher struct {

diff --git a/lnd/lnd_wallet.go b/lnd/lnd_wallet.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil/psbt"
+	"github.com/elementsproject/peerswap/lightning"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/swap"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
-	"github.com/sputn1ck/peerswap/lightning"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/swap"
 )
 
 func (l *Lnd) CreateOpeningTransaction(swapParams *swap.OpeningParams) (unpreparedTxHex string, fee uint64, vout uint32, err error) {

diff --git a/messages/sender.go b/messages/sender.go
@@ -1,9 +1,10 @@
 package messages
 
 import (
-	"github.com/sputn1ck/peerswap/log"
 	"sync"
 	"time"
+
+	"github.com/elementsproject/peerswap/log"
 )
 
 type Messenger interface {

diff --git a/misc_tests/btc_test.go b/misc_tests/btc_test.go
@@ -2,6 +2,7 @@
 // +build misc
 
 package misc_tests
+
 //
 //import (
 //	"bytes"
@@ -10,7 +11,7 @@ package misc_tests
 //	"encoding/hex"
 //	"encoding/json"
 //	"errors"
-//	"github.com/sputn1ck/peerswap/swap"
+//	"github.com/elementsproject/peerswap/swap"
 //	"log"
 //	"strconv"
 //	"testing"
@@ -23,8 +24,8 @@ package misc_tests
 //	"github.com/btcsuite/btcutil/psbt"
 //	"github.com/sputn1ck/glightning/gbitcoin"
 //	"github.com/sputn1ck/glightning/glightning"
-//	"github.com/sputn1ck/peerswap/lightning"
-//	"github.com/sputn1ck/peerswap/onchain"
+//	"github.com/elementsproject/peerswap/lightning"
+//	"github.com/elementsproject/peerswap/onchain"
 //)
 //
 //// btc swap

diff --git a/misc_tests/liquid_test.go b/misc_tests/liquid_test.go
@@ -11,14 +11,14 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcd/btcec"
-	"github.com/sputn1ck/peerswap/onchain"
-	"github.com/sputn1ck/peerswap/swap"
+	"github.com/elementsproject/peerswap/onchain"
+	"github.com/elementsproject/peerswap/swap"
 	"github.com/vulpemventures/go-elements/pset"
 	"github.com/vulpemventures/go-elements/transaction"
 
+	"github.com/elementsproject/peerswap/lightning"
+	wallet "github.com/elementsproject/peerswap/wallet"
 	"github.com/sputn1ck/glightning/gelements"
-	"github.com/sputn1ck/peerswap/lightning"
-	wallet "github.com/sputn1ck/peerswap/wallet"
 	"github.com/vulpemventures/go-elements/elementsutil"
 	"github.com/vulpemventures/go-elements/network"
 )
@@ -1383,21 +1383,20 @@ func rand32ByteArray() []byte {
 	return randArr[:]
 }
 
-
 //
 //import (
 //	"crypto/rand"
 //	"encoding/hex"
 //	"fmt"
 //	"github.com/btcsuite/btcd/btcec"
-//	"github.com/sputn1ck/peerswap/onchain"
-//	"github.com/sputn1ck/peerswap/swap"
+//	"github.com/elementsproject/peerswap/onchain"
+//	"github.com/elementsproject/peerswap/swap"
 //	"log"
 //	"testing"
 //
 //	"github.com/sputn1ck/glightning/gelements"
-//	"github.com/sputn1ck/peerswap/lightning"
-//	wallet "github.com/sputn1ck/peerswap/wallet"
+//	"github.com/elementsproject/peerswap/lightning"
+//	wallet "github.com/elementsproject/peerswap/wallet"
 //	"github.com/vulpemventures/go-elements/elementsutil"
 //	"github.com/vulpemventures/go-elements/network"
 //)

diff --git a/onchain/bitcoin.go b/onchain/bitcoin.go
@@ -10,7 +10,7 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/psbt"
-	"github.com/sputn1ck/peerswap/swap"
+	"github.com/elementsproject/peerswap/swap"
 )
 
 const (

diff --git a/onchain/liquid.go b/onchain/liquid.go
@@ -7,17 +7,18 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/peerswap/log"
+
+	"github.com/elementsproject/peerswap/log"
 
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/vulpemventures/go-elements/confidential"
 	"github.com/vulpemventures/go-elements/pset"
 
 	"github.com/btcsuite/btcd/txscript"
+	"github.com/elementsproject/peerswap/lightning"
+	"github.com/elementsproject/peerswap/swap"
+	"github.com/elementsproject/peerswap/wallet"
 	"github.com/sputn1ck/glightning/gelements"
-	"github.com/sputn1ck/peerswap/lightning"
-	"github.com/sputn1ck/peerswap/swap"
-	"github.com/sputn1ck/peerswap/wallet"
 	"github.com/vulpemventures/go-elements/address"
 	address2 "github.com/vulpemventures/go-elements/address"
 	"github.com/vulpemventures/go-elements/elementsutil"