From 311d4eaeb2b88bc34ac067b9a4d6b4d8d9a72cd5 Mon Sep 17 00:00:00 2001 From: Jad Wahab <15110087+jadwahab@users.noreply.github.com> Date: Tue, 26 Apr 2022 12:42:13 +0100 Subject: [PATCH] refactor: libsv -> bitcoin-sv --- cmd/internal/setup.go | 26 +++++++++---------- cmd/server/main.go | 6 ++--- data/http_client.go | 2 +- data/noop/noop.go | 2 +- data/payd/payd.go | 6 ++--- data/payd/payd_test.go | 8 +++--- data/sockets/payd.go | 2 +- go.mod | 2 +- log/log.go | 2 +- mocks/http_client.go | 2 +- service/payment.go | 2 +- service/payment_test.go | 4 +-- service/paymentrequest_proxy.go | 2 +- service/paymentrequest_test.go | 2 +- transports/http/middleware/error_handler.go | 4 +-- .../http/middleware/error_handler_test.go | 4 +-- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/cmd/internal/setup.go b/cmd/internal/setup.go index ed965c2..2c51027 100644 --- a/cmd/internal/setup.go +++ b/cmd/internal/setup.go @@ -6,18 +6,18 @@ import ( "net/http" "time" + dppProxy "github.com/bitcoin-sv/dp3" + "github.com/bitcoin-sv/dp3/data" + "github.com/bitcoin-sv/dp3/data/payd" + "github.com/bitcoin-sv/dp3/data/sockets" + "github.com/bitcoin-sv/dp3/docs" + "github.com/bitcoin-sv/dp3/log" + dppHandlers "github.com/bitcoin-sv/dp3/transports/http" + dppMiddleware "github.com/bitcoin-sv/dp3/transports/http/middleware" + dppSoc "github.com/bitcoin-sv/dp3/transports/sockets" "github.com/gorilla/websocket" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - dppProxy "github.com/libsv/dp3" - "github.com/libsv/dp3/data" - "github.com/libsv/dp3/data/payd" - "github.com/libsv/dp3/data/sockets" - "github.com/libsv/dp3/docs" - "github.com/libsv/dp3/log" - dppHandlers "github.com/libsv/dp3/transports/http" - dppMiddleware "github.com/libsv/dp3/transports/http/middleware" - dppSoc "github.com/libsv/dp3/transports/sockets" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/spf13/viper" @@ -25,10 +25,10 @@ import ( smw "github.com/theflyingcodr/sockets/middleware" "github.com/theflyingcodr/sockets/server" - "github.com/libsv/dp3/config" - "github.com/libsv/dp3/data/noop" - socData "github.com/libsv/dp3/data/sockets" - "github.com/libsv/dp3/service" + "github.com/bitcoin-sv/dp3/config" + "github.com/bitcoin-sv/dp3/data/noop" + socData "github.com/bitcoin-sv/dp3/data/sockets" + "github.com/bitcoin-sv/dp3/service" "github.com/libsv/go-dpp" ) diff --git a/cmd/server/main.go b/cmd/server/main.go index 42ac241..7ae1fb3 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -6,9 +6,9 @@ import ( "os/signal" "time" - "github.com/libsv/dp3/cmd/internal" - "github.com/libsv/dp3/config" - "github.com/libsv/dp3/log" + "github.com/bitcoin-sv/dp3/cmd/internal" + "github.com/bitcoin-sv/dp3/config" + "github.com/bitcoin-sv/dp3/log" ) const appname = "payment-protocol-rest-server" diff --git a/data/http_client.go b/data/http_client.go index 9917a44..c08a5a8 100644 --- a/data/http_client.go +++ b/data/http_client.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "net/http" - server "github.com/libsv/dp3" + server "github.com/bitcoin-sv/dp3" "github.com/pkg/errors" validator "github.com/theflyingcodr/govalidator" "github.com/theflyingcodr/lathos/errs" diff --git a/data/noop/noop.go b/data/noop/noop.go index a078d2d..29f6542 100644 --- a/data/noop/noop.go +++ b/data/noop/noop.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/libsv/dp3/log" + "github.com/bitcoin-sv/dp3/log" "github.com/libsv/go-bt/v2" "github.com/libsv/go-bt/v2/bscript" diff --git a/data/payd/payd.go b/data/payd/payd.go index 1df1a0f..8fd5434 100644 --- a/data/payd/payd.go +++ b/data/payd/payd.go @@ -8,9 +8,9 @@ import ( "github.com/libsv/go-bk/envelope" "github.com/pkg/errors" - "github.com/libsv/dp3/config" - "github.com/libsv/dp3/data" - "github.com/libsv/dp3/data/payd/models" + "github.com/bitcoin-sv/dp3/config" + "github.com/bitcoin-sv/dp3/data" + "github.com/bitcoin-sv/dp3/data/payd/models" "github.com/libsv/go-dpp" ) diff --git a/data/payd/payd_test.go b/data/payd/payd_test.go index 528f46b..2c8ed5d 100644 --- a/data/payd/payd_test.go +++ b/data/payd/payd_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/libsv/dp3/config" - "github.com/libsv/dp3/data/payd" - "github.com/libsv/dp3/data/payd/models" - "github.com/libsv/dp3/mocks" + "github.com/bitcoin-sv/dp3/config" + "github.com/bitcoin-sv/dp3/data/payd" + "github.com/bitcoin-sv/dp3/data/payd/models" + "github.com/bitcoin-sv/dp3/mocks" "github.com/libsv/go-bt/v2" "github.com/libsv/go-bt/v2/bscript" "github.com/libsv/go-dpp" diff --git a/data/sockets/payd.go b/data/sockets/payd.go index 58df20c..e655868 100644 --- a/data/sockets/payd.go +++ b/data/sockets/payd.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + server "github.com/bitcoin-sv/dp3" "github.com/google/uuid" - server "github.com/libsv/dp3" "github.com/libsv/go-bk/envelope" "github.com/pkg/errors" "github.com/theflyingcodr/lathos/errs" diff --git a/go.mod b/go.mod index a460b0e..ff4a104 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/libsv/dp3 +module github.com/bitcoin-sv/dp3 go 1.17 diff --git a/log/log.go b/log/log.go index ce91157..c09a79f 100644 --- a/log/log.go +++ b/log/log.go @@ -1,7 +1,7 @@ package log import ( - "github.com/libsv/dp3/config" + "github.com/bitcoin-sv/dp3/config" "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/mocks/http_client.go b/mocks/http_client.go index 8273310..dc0a633 100644 --- a/mocks/http_client.go +++ b/mocks/http_client.go @@ -5,7 +5,7 @@ package mocks import ( "context" - "github.com/libsv/dp3/data" + "github.com/bitcoin-sv/dp3/data" "sync" ) diff --git a/service/payment.go b/service/payment.go index 549c74c..5d1f81b 100644 --- a/service/payment.go +++ b/service/payment.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/libsv/dp3/log" + "github.com/bitcoin-sv/dp3/log" "github.com/libsv/go-dpp" ) diff --git a/service/payment_test.go b/service/payment_test.go index fdbc5c7..5c54610 100644 --- a/service/payment_test.go +++ b/service/payment_test.go @@ -6,8 +6,8 @@ import ( "errors" "testing" - "github.com/libsv/dp3/log" - "github.com/libsv/dp3/service" + "github.com/bitcoin-sv/dp3/log" + "github.com/bitcoin-sv/dp3/service" "github.com/libsv/go-bc/spv" "github.com/libsv/go-dpp" dppMocks "github.com/libsv/go-dpp/mocks" diff --git a/service/paymentrequest_proxy.go b/service/paymentrequest_proxy.go index 3549760..68e7e0e 100644 --- a/service/paymentrequest_proxy.go +++ b/service/paymentrequest_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/libsv/dp3/config" + "github.com/bitcoin-sv/dp3/config" "github.com/libsv/go-dpp" "github.com/pkg/errors" validator "github.com/theflyingcodr/govalidator" diff --git a/service/paymentrequest_test.go b/service/paymentrequest_test.go index b655d83..a35673e 100644 --- a/service/paymentrequest_test.go +++ b/service/paymentrequest_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/libsv/dp3/service" + "github.com/bitcoin-sv/dp3/service" "github.com/libsv/go-bt/v2/bscript" "github.com/libsv/go-dpp" dppMocks "github.com/libsv/go-dpp/mocks" diff --git a/transports/http/middleware/error_handler.go b/transports/http/middleware/error_handler.go index d59acfb..2dd1208 100644 --- a/transports/http/middleware/error_handler.go +++ b/transports/http/middleware/error_handler.go @@ -4,9 +4,9 @@ import ( "errors" "net/http" + server "github.com/bitcoin-sv/dp3" + "github.com/bitcoin-sv/dp3/log" "github.com/labstack/echo/v4" - server "github.com/libsv/dp3" - "github.com/libsv/dp3/log" validator "github.com/theflyingcodr/govalidator" "github.com/theflyingcodr/lathos" "github.com/theflyingcodr/lathos/errs" diff --git a/transports/http/middleware/error_handler_test.go b/transports/http/middleware/error_handler_test.go index 26d461d..ad1d1c7 100644 --- a/transports/http/middleware/error_handler_test.go +++ b/transports/http/middleware/error_handler_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" + "github.com/bitcoin-sv/dp3/log" + "github.com/bitcoin-sv/dp3/transports/http/middleware" "github.com/labstack/echo/v4" - "github.com/libsv/dp3/log" - "github.com/libsv/dp3/transports/http/middleware" "github.com/stretchr/testify/assert" validator "github.com/theflyingcodr/govalidator" "github.com/theflyingcodr/lathos/errs"