From d4e8957de583e5df41992bf0e27935287254d9c6 Mon Sep 17 00:00:00 2001 From: Daniel Raper Date: Wed, 24 Jun 2026 10:10:24 +0100 Subject: [PATCH] Replace references from hyperledger/firefly-common to hyperledger-firefly/common Signed-off-by: Daniel Raper --- CHANGELOG.md | 2 +- README.md | 18 +++++++++--------- examples/ffpubsub.go | 12 ++++++------ go.mod | 2 +- mocks/authmocks/plugin.go | 4 ++-- mocks/crudmocks/crud.go | 4 ++-- mocks/wsservermocks/protocol.go | 2 +- mocks/wsservermocks/web_socket_server.go | 2 +- pkg/auth/authfactory/factory.go | 8 ++++---- pkg/auth/basic/basic_auth.go | 8 ++++---- pkg/auth/basic/basic_auth_test.go | 4 ++-- pkg/auth/basic/config.go | 2 +- pkg/auth/handler.go | 2 +- pkg/auth/handler_test.go | 4 ++-- pkg/auth/plugin.go | 4 ++-- pkg/cache/cache.go | 2 +- pkg/config/config.go | 8 ++++---- pkg/config/config_test.go | 4 ++-- pkg/dbsql/config.go | 2 +- pkg/dbsql/crud.go | 8 ++++---- pkg/dbsql/crud_test.go | 8 ++++---- pkg/dbsql/database.go | 10 +++++----- pkg/dbsql/database_test.go | 2 +- pkg/dbsql/filter_sql.go | 4 ++-- pkg/dbsql/filter_sql_test.go | 4 ++-- pkg/dbsql/mock_provider.go | 4 ++-- pkg/dbsql/postgres_helpers.go | 2 +- pkg/dbsql/postgres_helpers_test.go | 2 +- pkg/dbsql/provider_sqlitego.go | 2 +- pkg/eventstreams/activestream.go | 8 ++++---- pkg/eventstreams/activestream_test.go | 2 +- pkg/eventstreams/config.go | 10 +++++----- pkg/eventstreams/config_test.go | 4 ++-- pkg/eventstreams/e2e_test.go | 14 +++++++------- pkg/eventstreams/event.go | 2 +- pkg/eventstreams/eventstreams.go | 10 +++++----- pkg/eventstreams/eventstreams_test.go | 6 +++--- pkg/eventstreams/manager.go | 12 ++++++------ pkg/eventstreams/manager_test.go | 14 +++++++------- pkg/eventstreams/persistence.go | 6 +++--- pkg/eventstreams/webhooks.go | 8 ++++---- pkg/eventstreams/webhooks_test.go | 8 ++++---- pkg/eventstreams/websockets.go | 6 +++--- pkg/ffapi/apiserver.go | 12 ++++++------ pkg/ffapi/apiserver_config.go | 4 ++-- pkg/ffapi/apiserver_test.go | 6 +++--- pkg/ffapi/filter.go | 4 ++-- pkg/ffapi/filter_test.go | 2 +- pkg/ffapi/handler.go | 8 ++++---- pkg/ffapi/handler_test.go | 4 ++-- pkg/ffapi/openapi3.go | 6 +++--- pkg/ffapi/openapi3_test.go | 6 +++--- pkg/ffapi/query_fields.go | 4 ++-- pkg/ffapi/query_fields_test.go | 2 +- pkg/ffapi/restfilter.go | 4 ++-- pkg/ffapi/restfilter_json.go | 2 +- pkg/ffapi/restfilter_json_builder.go | 2 +- pkg/ffapi/routes.go | 4 ++-- pkg/ffapi/update.go | 2 +- pkg/ffapi/update_test.go | 2 +- pkg/ffdns/config.go | 2 +- pkg/ffdns/ffdns.go | 4 ++-- pkg/ffdns/ffdns_test.go | 4 ++-- pkg/ffnet/config.go | 2 +- pkg/ffnet/ffnet.go | 2 +- pkg/ffnet/ffnet_test.go | 4 ++-- pkg/ffresty/config.go | 10 +++++----- pkg/ffresty/config_test.go | 6 +++--- pkg/ffresty/ffresty.go | 12 ++++++------ pkg/ffresty/ffresty_test.go | 14 +++++++------- pkg/fftls/certexpiry_test.go | 4 ++-- pkg/fftls/config.go | 2 +- pkg/fftls/fftls.go | 8 ++++---- pkg/fftls/fftls_test.go | 2 +- pkg/fftypes/bigint.go | 2 +- pkg/fftypes/bytetypes.go | 2 +- pkg/fftypes/enum.go | 4 ++-- pkg/fftypes/ffi.go | 2 +- pkg/fftypes/int.go | 2 +- pkg/fftypes/jsonany.go | 4 ++-- pkg/fftypes/jsonobject.go | 4 ++-- pkg/fftypes/jsonobjectarray.go | 2 +- pkg/fftypes/jsonscan.go | 2 +- pkg/fftypes/sentinal_errors.go | 2 +- pkg/fftypes/sizeutils.go | 2 +- pkg/fftypes/stringarray.go | 2 +- pkg/fftypes/timeutils.go | 4 ++-- pkg/fftypes/uuid.go | 2 +- pkg/fftypes/validations.go | 2 +- pkg/fswatcher/fswatcher.go | 6 +++--- pkg/httpserver/config.go | 6 +++--- pkg/httpserver/debugserver.go | 4 ++-- pkg/httpserver/debugserver_test.go | 2 +- pkg/httpserver/httpserver.go | 10 +++++----- pkg/httpserver/httpserver_test.go | 8 ++++---- pkg/httpserver/server_auth.go | 6 +++--- pkg/httpserver/server_auth_test.go | 4 ++-- pkg/httpserver/server_cors.go | 4 ++-- pkg/httpserver/server_cors_test.go | 2 +- pkg/i18n/es/es_base_config_descriptions.go | 2 +- pkg/metric/metric.go | 2 +- pkg/metric/prometheusMetricsManager.go | 4 ++-- pkg/retry/config.go | 2 +- pkg/retry/config_test.go | 2 +- pkg/retry/retry.go | 4 ++-- pkg/version/version.go | 4 ++-- pkg/wsclient/wsclient.go | 10 +++++----- pkg/wsclient/wsconfig.go | 10 +++++----- pkg/wsclient/wsconfig_test.go | 10 +++++----- pkg/wsserver/config.go | 2 +- pkg/wsserver/config_test.go | 2 +- pkg/wsserver/wsconn.go | 6 +++--- pkg/wsserver/wsserver.go | 4 ++-- pkg/wsserver/wsserver_test.go | 2 +- 114 files changed, 278 insertions(+), 278 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0cf25aa..c6408914 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ # Changelog -[FireFly Common Releases](https://github.com/hyperledger/firefly-common/releases) +[FireFly Common Releases](https://github.com/hyperledger-firefly/common/releases) diff --git a/README.md b/README.md index fbb97285..1102d420 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -[![codecov](https://codecov.io/gh/hyperledger/firefly-common/branch/main/graph/badge.svg?token=LUX2I5EU0T)](https://codecov.io/gh/hyperledger/firefly-common) -[![Go Reference](https://pkg.go.dev/badge/github.com/hyperledger/firefly-common.svg)](https://pkg.go.dev/github.com/hyperledger/firefly-common) +[![codecov](https://codecov.io/gh/hyperledger-firefly/common/branch/main/graph/badge.svg?token=LUX2I5EU0T)](https://codecov.io/gh/hyperledger-firefly/common) +[![Go Reference](https://pkg.go.dev/badge/github.com/hyperledger-firefly/common.svg)](https://pkg.go.dev/github.com/hyperledger-firefly/common) # Hyperledger FireFly Common Common utility modules and interface definitions, used across Hyperledger FireFly microservice runtimes (the Go ones anyway): -- Logging - [pkg/log](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/log) -- Translation (i18n) - [pkg/i18n](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/i18n) -- Configuration - [pkg/config](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/config) -- Common types - [pkg/fftypes](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/fftypes) -- REST Client - [pkg/ffresty](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/ffresty) -- WebSocket Client - [pkg/wsclient](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/wsclient) -- HTTP Server - [pkg/httpserver](https://pkg.go.dev/github.com/hyperledger/firefly-common/pkg/httpserver) +- Logging - [pkg/log](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/log) +- Translation (i18n) - [pkg/i18n](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/i18n) +- Configuration - [pkg/config](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/config) +- Common types - [pkg/fftypes](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/fftypes) +- REST Client - [pkg/ffresty](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/ffresty) +- WebSocket Client - [pkg/wsclient](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/wsclient) +- HTTP Server - [pkg/httpserver](https://pkg.go.dev/github.com/hyperledger-firefly/common/pkg/httpserver) diff --git a/examples/ffpubsub.go b/examples/ffpubsub.go index 6ff8055a..7411fb99 100644 --- a/examples/ffpubsub.go +++ b/examples/ffpubsub.go @@ -27,12 +27,12 @@ import ( "strconv" "sync" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/eventstreams" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsserver" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/eventstreams" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsserver" ) // Run from root of project with: diff --git a/go.mod b/go.mod index 881db1a3..539fc9b0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/firefly-common +module github.com/hyperledger-firefly/common go 1.23.0 diff --git a/mocks/authmocks/plugin.go b/mocks/authmocks/plugin.go index 0ca63b3b..10929337 100644 --- a/mocks/authmocks/plugin.go +++ b/mocks/authmocks/plugin.go @@ -5,9 +5,9 @@ package authmocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/crudmocks/crud.go b/mocks/crudmocks/crud.go index ca8768d8..910fb086 100644 --- a/mocks/crudmocks/crud.go +++ b/mocks/crudmocks/crud.go @@ -5,8 +5,8 @@ package crudmocks import ( context "context" - dbsql "github.com/hyperledger/firefly-common/pkg/dbsql" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" + dbsql "github.com/hyperledger-firefly/common/pkg/dbsql" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" mock "github.com/stretchr/testify/mock" diff --git a/mocks/wsservermocks/protocol.go b/mocks/wsservermocks/protocol.go index 9f6e82bc..17e018a1 100644 --- a/mocks/wsservermocks/protocol.go +++ b/mocks/wsservermocks/protocol.go @@ -5,7 +5,7 @@ package wsservermocks import ( context "context" - wsserver "github.com/hyperledger/firefly-common/pkg/wsserver" + wsserver "github.com/hyperledger-firefly/common/pkg/wsserver" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/wsservermocks/web_socket_server.go b/mocks/wsservermocks/web_socket_server.go index 23a534de..cee60e20 100644 --- a/mocks/wsservermocks/web_socket_server.go +++ b/mocks/wsservermocks/web_socket_server.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" - wsserver "github.com/hyperledger/firefly-common/pkg/wsserver" + wsserver "github.com/hyperledger-firefly/common/pkg/wsserver" ) // WebSocketServer is an autogenerated mock type for the WebSocketServer type diff --git a/pkg/auth/authfactory/factory.go b/pkg/auth/authfactory/factory.go index 21a02d77..a76f35c2 100644 --- a/pkg/auth/authfactory/factory.go +++ b/pkg/auth/authfactory/factory.go @@ -19,10 +19,10 @@ package authfactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/auth" - "github.com/hyperledger/firefly-common/pkg/auth/basic" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/auth" + "github.com/hyperledger-firefly/common/pkg/auth/basic" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" ) const ( diff --git a/pkg/auth/basic/basic_auth.go b/pkg/auth/basic/basic_auth.go index c46afe6c..6945fec5 100644 --- a/pkg/auth/basic/basic_auth.go +++ b/pkg/auth/basic/basic_auth.go @@ -23,10 +23,10 @@ import ( "os" "strings" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" "golang.org/x/crypto/bcrypt" ) diff --git a/pkg/auth/basic/basic_auth_test.go b/pkg/auth/basic/basic_auth_test.go index f1b60860..a78744f8 100644 --- a/pkg/auth/basic/basic_auth_test.go +++ b/pkg/auth/basic/basic_auth_test.go @@ -22,8 +22,8 @@ import ( "net/url" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/auth/basic/config.go b/pkg/auth/basic/config.go index c2b1cd29..7961fff4 100644 --- a/pkg/auth/basic/config.go +++ b/pkg/auth/basic/config.go @@ -17,7 +17,7 @@ package basic import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/pkg/auth/handler.go b/pkg/auth/handler.go index e2e1f288..8159c778 100644 --- a/pkg/auth/handler.go +++ b/pkg/auth/handler.go @@ -21,7 +21,7 @@ import ( "encoding/json" "net/http" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type Handler struct { diff --git a/pkg/auth/handler_test.go b/pkg/auth/handler_test.go index 5adfdbc6..7e5bdbc3 100644 --- a/pkg/auth/handler_test.go +++ b/pkg/auth/handler_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" - "github.com/hyperledger/firefly-common/pkg/auth/basic" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/auth/basic" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/auth/plugin.go b/pkg/auth/plugin.go index 83def14e..b5c1abc3 100644 --- a/pkg/auth/plugin.go +++ b/pkg/auth/plugin.go @@ -19,8 +19,8 @@ package auth import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type Plugin interface { diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index 6f586ebc..af09dbe7 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -32,7 +32,7 @@ const ( // // The default behavior is that items are returned until they have been purged from the cache by an // synchronous reaper - // NOTE: see issue https://github.com/hyperledger/firefly-common/issues/85 on operation of the async reaper. + // NOTE: see issue https://github.com/hyperledger-firefly/common/issues/85 on operation of the async reaper. StrictExpiry BehaviorOption = iota // TTLFromInitialAdd sets the behavior so that the time-to-live for a cache entry is set when diff --git a/pkg/config/config.go b/pkg/config/config.go index 8137e5b7..97e73625 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -29,10 +29,10 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/fswatcher" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fswatcher" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/sirupsen/logrus" "github.com/spf13/viper" diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index d76d8897..428b0f67 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/stretchr/testify/assert" diff --git a/pkg/dbsql/config.go b/pkg/dbsql/config.go index 1684cf29..ef84448f 100644 --- a/pkg/dbsql/config.go +++ b/pkg/dbsql/config.go @@ -19,7 +19,7 @@ package dbsql import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/pkg/dbsql/crud.go b/pkg/dbsql/crud.go index 05f5fcf4..3e4e71d5 100644 --- a/pkg/dbsql/crud.go +++ b/pkg/dbsql/crud.go @@ -25,10 +25,10 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) const ( diff --git a/pkg/dbsql/crud_test.go b/pkg/dbsql/crud_test.go index 08e18534..1f7e7e53 100644 --- a/pkg/dbsql/crud_test.go +++ b/pkg/dbsql/crud_test.go @@ -28,10 +28,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/dbsql/database.go b/pkg/dbsql/database.go index 616af346..cc422a45 100644 --- a/pkg/dbsql/database.go +++ b/pkg/dbsql/database.go @@ -24,11 +24,11 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/golang-migrate/migrate/v4" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/golang-migrate/migrate/v4/database" // Import migrate file source diff --git a/pkg/dbsql/database_test.go b/pkg/dbsql/database_test.go index 52d4da5a..12031811 100644 --- a/pkg/dbsql/database_test.go +++ b/pkg/dbsql/database_test.go @@ -24,7 +24,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/ffapi" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/pkg/dbsql/filter_sql.go b/pkg/dbsql/filter_sql.go index 14359ad2..cca4f0a8 100644 --- a/pkg/dbsql/filter_sql.go +++ b/pkg/dbsql/filter_sql.go @@ -22,8 +22,8 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/i18n" ) const escapeChar = "[" diff --git a/pkg/dbsql/filter_sql_test.go b/pkg/dbsql/filter_sql_test.go index 99932a3f..5c57c6c4 100644 --- a/pkg/dbsql/filter_sql_test.go +++ b/pkg/dbsql/filter_sql_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/dbsql/mock_provider.go b/pkg/dbsql/mock_provider.go index 479f60b4..e42cf488 100644 --- a/pkg/dbsql/mock_provider.go +++ b/pkg/dbsql/mock_provider.go @@ -24,8 +24,8 @@ import ( "github.com/DATA-DOG/go-sqlmock" sq "github.com/Masterminds/squirrel" migratedb "github.com/golang-migrate/migrate/v4/database" - "github.com/hyperledger/firefly-common/mocks/dbmigratemocks" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/mocks/dbmigratemocks" + "github.com/hyperledger-firefly/common/pkg/config" ) // MockProvider uses the datadog mocking framework diff --git a/pkg/dbsql/postgres_helpers.go b/pkg/dbsql/postgres_helpers.go index b8f98b8a..287eae32 100644 --- a/pkg/dbsql/postgres_helpers.go +++ b/pkg/dbsql/postgres_helpers.go @@ -23,7 +23,7 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // BuildPostgreSQLOptimizedUpsert is a PostgreSQL helper to avoid implementing this lots of times in child packages diff --git a/pkg/dbsql/postgres_helpers_test.go b/pkg/dbsql/postgres_helpers_test.go index 0e84c15d..9ad857c7 100644 --- a/pkg/dbsql/postgres_helpers_test.go +++ b/pkg/dbsql/postgres_helpers_test.go @@ -21,7 +21,7 @@ import ( "database/sql/driver" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/dbsql/provider_sqlitego.go b/pkg/dbsql/provider_sqlitego.go index 4f913811..428af174 100644 --- a/pkg/dbsql/provider_sqlitego.go +++ b/pkg/dbsql/provider_sqlitego.go @@ -23,7 +23,7 @@ import ( sq "github.com/Masterminds/squirrel" migratedb "github.com/golang-migrate/migrate/v4/database" "github.com/golang-migrate/migrate/v4/database/sqlite3" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" // Import SQLite driver _ "github.com/mattn/go-sqlite3" diff --git a/pkg/eventstreams/activestream.go b/pkg/eventstreams/activestream.go index 060078b9..f2452136 100644 --- a/pkg/eventstreams/activestream.go +++ b/pkg/eventstreams/activestream.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) type eventStreamBatch[DataType any] struct { diff --git a/pkg/eventstreams/activestream_test.go b/pkg/eventstreams/activestream_test.go index 5b3ee886..9abf41dd 100644 --- a/pkg/eventstreams/activestream_test.go +++ b/pkg/eventstreams/activestream_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/eventstreams/config.go b/pkg/eventstreams/config.go index caa8dee5..f95051a7 100644 --- a/pkg/eventstreams/config.go +++ b/pkg/eventstreams/config.go @@ -20,11 +20,11 @@ import ( "context" "crypto/tls" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" ) // DispatcherFactory is the interface to plug in a custom dispatcher, for example to provide diff --git a/pkg/eventstreams/config_test.go b/pkg/eventstreams/config_test.go index 2e05099d..724b4f0d 100644 --- a/pkg/eventstreams/config_test.go +++ b/pkg/eventstreams/config_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" "github.com/stretchr/testify/assert" ) diff --git a/pkg/eventstreams/e2e_test.go b/pkg/eventstreams/e2e_test.go index 06e78c9e..f5a9f098 100644 --- a/pkg/eventstreams/e2e_test.go +++ b/pkg/eventstreams/e2e_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-common/pkg/wsserver" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/wsserver" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/eventstreams/event.go b/pkg/eventstreams/event.go index f2cb811a..4788611c 100644 --- a/pkg/eventstreams/event.go +++ b/pkg/eventstreams/event.go @@ -19,7 +19,7 @@ package eventstreams import ( "encoding/json" - "github.com/hyperledger/firefly-common/pkg/wsserver" + "github.com/hyperledger-firefly/common/pkg/wsserver" ) const MessageTypeEventBatch = "event_batch" diff --git a/pkg/eventstreams/eventstreams.go b/pkg/eventstreams/eventstreams.go index 3792a6a4..8adec885 100644 --- a/pkg/eventstreams/eventstreams.go +++ b/pkg/eventstreams/eventstreams.go @@ -23,11 +23,11 @@ import ( "regexp" "sync" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" ) type EventStreamType = fftypes.FFEnum diff --git a/pkg/eventstreams/eventstreams_test.go b/pkg/eventstreams/eventstreams_test.go index a4f4da99..95ff0975 100644 --- a/pkg/eventstreams/eventstreams_test.go +++ b/pkg/eventstreams/eventstreams_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/eventstreams/manager.go b/pkg/eventstreams/manager.go index 96cc2d53..ce7d4551 100644 --- a/pkg/eventstreams/manager.go +++ b/pkg/eventstreams/manager.go @@ -21,12 +21,12 @@ import ( "crypto/tls" "sync" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsserver" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsserver" ) type Manager[CT EventStreamSpec] interface { diff --git a/pkg/eventstreams/manager_test.go b/pkg/eventstreams/manager_test.go index 929d4a1f..b19b178e 100644 --- a/pkg/eventstreams/manager_test.go +++ b/pkg/eventstreams/manager_test.go @@ -21,13 +21,13 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/mocks/crudmocks" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" + "github.com/hyperledger-firefly/common/mocks/crudmocks" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/pkg/eventstreams/persistence.go b/pkg/eventstreams/persistence.go index 3de985b1..ef68352f 100644 --- a/pkg/eventstreams/persistence.go +++ b/pkg/eventstreams/persistence.go @@ -20,9 +20,9 @@ import ( "context" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type Persistence[CT EventStreamSpec] interface { diff --git a/pkg/eventstreams/webhooks.go b/pkg/eventstreams/webhooks.go index 22f255e2..6253d6ac 100644 --- a/pkg/eventstreams/webhooks.go +++ b/pkg/eventstreams/webhooks.go @@ -25,10 +25,10 @@ import ( "net/url" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) type WebhookConfig struct { diff --git a/pkg/eventstreams/webhooks_test.go b/pkg/eventstreams/webhooks_test.go index f070c716..c8514c3a 100644 --- a/pkg/eventstreams/webhooks_test.go +++ b/pkg/eventstreams/webhooks_test.go @@ -25,10 +25,10 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/wsserver" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/wsserver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/eventstreams/websockets.go b/pkg/eventstreams/websockets.go index e4ba31cb..733d88db 100644 --- a/pkg/eventstreams/websockets.go +++ b/pkg/eventstreams/websockets.go @@ -21,9 +21,9 @@ import ( "crypto/tls" "database/sql/driver" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsserver" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsserver" ) type DistributionMode = fftypes.FFEnum diff --git a/pkg/ffapi/apiserver.go b/pkg/ffapi/apiserver.go index 17b9d083..5574f0ce 100644 --- a/pkg/ffapi/apiserver.go +++ b/pkg/ffapi/apiserver.go @@ -32,12 +32,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/httpserver" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/metric" "github.com/sirupsen/logrus" ) diff --git a/pkg/ffapi/apiserver_config.go b/pkg/ffapi/apiserver_config.go index 2d374c4e..b1fc35b1 100644 --- a/pkg/ffapi/apiserver_config.go +++ b/pkg/ffapi/apiserver_config.go @@ -17,8 +17,8 @@ package ffapi import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/httpserver" ) var ( diff --git a/pkg/ffapi/apiserver_test.go b/pkg/ffapi/apiserver_test.go index 6f0fd117..22e5ae48 100644 --- a/pkg/ffapi/apiserver_test.go +++ b/pkg/ffapi/apiserver_test.go @@ -28,9 +28,9 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/httpserver" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/metric" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ffapi/filter.go b/pkg/ffapi/filter.go index 16ab200e..69e6708e 100644 --- a/pkg/ffapi/filter.go +++ b/pkg/ffapi/filter.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type FilterModifiers[T any] interface { diff --git a/pkg/ffapi/filter_test.go b/pkg/ffapi/filter_test.go index cbd52d4b..46073503 100644 --- a/pkg/ffapi/filter_test.go +++ b/pkg/ffapi/filter_test.go @@ -21,7 +21,7 @@ import ( "database/sql/driver" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ffapi/handler.go b/pkg/ffapi/handler.go index 9409b1ed..8c3b40f0 100644 --- a/pkg/ffapi/handler.go +++ b/pkg/ffapi/handler.go @@ -33,10 +33,10 @@ import ( "github.com/ghodss/yaml" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/httpserver" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/pkg/ffapi/handler_test.go b/pkg/ffapi/handler_test.go index 3db1aced..90ce1a4d 100644 --- a/pkg/ffapi/handler_test.go +++ b/pkg/ffapi/handler_test.go @@ -35,8 +35,8 @@ import ( "github.com/stretchr/testify/require" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/httpserver" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ffapi/openapi3.go b/pkg/ffapi/openapi3.go index d6b32024..caca5fb8 100644 --- a/pkg/ffapi/openapi3.go +++ b/pkg/ffapi/openapi3.go @@ -31,9 +31,9 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/getkin/kin-openapi/openapi3gen" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type SwaggerGenOptions struct { diff --git a/pkg/ffapi/openapi3_test.go b/pkg/ffapi/openapi3_test.go index acf728b5..f16ea1d2 100644 --- a/pkg/ffapi/openapi3_test.go +++ b/pkg/ffapi/openapi3_test.go @@ -26,9 +26,9 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/ghodss/yaml" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" "github.com/stretchr/testify/assert" "golang.org/x/text/language" ) diff --git a/pkg/ffapi/query_fields.go b/pkg/ffapi/query_fields.go index 34c76500..27d4146e 100644 --- a/pkg/ffapi/query_fields.go +++ b/pkg/ffapi/query_fields.go @@ -28,8 +28,8 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // QueryFactory creates a filter builder in the given context, and contains the rules on diff --git a/pkg/ffapi/query_fields_test.go b/pkg/ffapi/query_fields_test.go index b9c5e211..10a148f0 100644 --- a/pkg/ffapi/query_fields_test.go +++ b/pkg/ffapi/query_fields_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ffapi/restfilter.go b/pkg/ffapi/restfilter.go index dc85ee67..b469ad1e 100644 --- a/pkg/ffapi/restfilter.go +++ b/pkg/ffapi/restfilter.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) func (hs *HandlerFactory) getValues(values url.Values, key string) (results []string) { diff --git a/pkg/ffapi/restfilter_json.go b/pkg/ffapi/restfilter_json.go index b8d26615..63a83484 100644 --- a/pkg/ffapi/restfilter_json.go +++ b/pkg/ffapi/restfilter_json.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) var allMods = []string{"not", "caseInsensitive"} diff --git a/pkg/ffapi/restfilter_json_builder.go b/pkg/ffapi/restfilter_json_builder.go index b081af89..d3919df2 100644 --- a/pkg/ffapi/restfilter_json_builder.go +++ b/pkg/ffapi/restfilter_json_builder.go @@ -17,7 +17,7 @@ package ffapi import ( - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type addOns func(op *FilterJSONBase) diff --git a/pkg/ffapi/routes.go b/pkg/ffapi/routes.go index f92f7fc8..e1b4fe5d 100644 --- a/pkg/ffapi/routes.go +++ b/pkg/ffapi/routes.go @@ -22,8 +22,8 @@ import ( "net/http" "github.com/getkin/kin-openapi/openapi3" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // SchemaGenerator is passed into the JSONInputSchema advanced customization function, to give diff --git a/pkg/ffapi/update.go b/pkg/ffapi/update.go index d2391aa7..00b25972 100644 --- a/pkg/ffapi/update.go +++ b/pkg/ffapi/update.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type UpdateOps interface { diff --git a/pkg/ffapi/update_test.go b/pkg/ffapi/update_test.go index 8cd4eafb..144a5dea 100644 --- a/pkg/ffapi/update_test.go +++ b/pkg/ffapi/update_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ffdns/config.go b/pkg/ffdns/config.go index af7833fa..906113cc 100644 --- a/pkg/ffdns/config.go +++ b/pkg/ffdns/config.go @@ -19,7 +19,7 @@ package ffdns import ( "time" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/pkg/ffdns/ffdns.go b/pkg/ffdns/ffdns.go index 3f7c5c16..8abc772e 100644 --- a/pkg/ffdns/ffdns.go +++ b/pkg/ffdns/ffdns.go @@ -21,8 +21,8 @@ import ( "errors" "net" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/metric" ) const ( diff --git a/pkg/ffdns/ffdns_test.go b/pkg/ffdns/ffdns_test.go index 23557091..9e211309 100644 --- a/pkg/ffdns/ffdns_test.go +++ b/pkg/ffdns/ffdns_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/metric" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/ffnet/config.go b/pkg/ffnet/config.go index 92844b5f..bbdc9a8e 100644 --- a/pkg/ffnet/config.go +++ b/pkg/ffnet/config.go @@ -20,7 +20,7 @@ package ffnet import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/pkg/ffnet/ffnet.go b/pkg/ffnet/ffnet.go index b3f4ae15..31fae040 100644 --- a/pkg/ffnet/ffnet.go +++ b/pkg/ffnet/ffnet.go @@ -21,7 +21,7 @@ import ( "net" "syscall" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // NewDialer builds a *net.Dialer wired with the CIDR egress guard and provided the DNS resolver (if any). diff --git a/pkg/ffnet/ffnet_test.go b/pkg/ffnet/ffnet_test.go index 08af0e29..9d195335 100644 --- a/pkg/ffnet/ffnet_test.go +++ b/pkg/ffnet/ffnet_test.go @@ -21,8 +21,8 @@ import ( "net" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffdns" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffdns" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/ffresty/config.go b/pkg/ffresty/config.go index 05bbef2f..ecd9fbec 100644 --- a/pkg/ffresty/config.go +++ b/pkg/ffresty/config.go @@ -19,11 +19,11 @@ package ffresty import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffdns" - "github.com/hyperledger/firefly-common/pkg/ffnet" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffdns" + "github.com/hyperledger-firefly/common/pkg/ffnet" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) const ( diff --git a/pkg/ffresty/config_test.go b/pkg/ffresty/config_test.go index f4a20a61..ddb53cfb 100644 --- a/pkg/ffresty/config_test.go +++ b/pkg/ffresty/config_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/ffdns" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/ffdns" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ffresty/ffresty.go b/pkg/ffresty/ffresty.go index 3d2ea094..69727265 100644 --- a/pkg/ffresty/ffresty.go +++ b/pkg/ffresty/ffresty.go @@ -32,12 +32,12 @@ import ( "time" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/metric" "github.com/sirupsen/logrus" "golang.org/x/time/rate" ) diff --git a/pkg/ffresty/ffresty_test.go b/pkg/ffresty/ffresty_test.go index d60de282..108243e8 100644 --- a/pkg/ffresty/ffresty_test.go +++ b/pkg/ffresty/ffresty_test.go @@ -40,13 +40,13 @@ import ( "time" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/ffdns" - "github.com/hyperledger/firefly-common/pkg/ffnet" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/ffdns" + "github.com/hyperledger-firefly/common/pkg/ffnet" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/metric" "github.com/sirupsen/logrus" "golang.org/x/time/rate" diff --git a/pkg/fftls/certexpiry_test.go b/pkg/fftls/certexpiry_test.go index eb7efd30..e949c39b 100644 --- a/pkg/fftls/certexpiry_test.go +++ b/pkg/fftls/certexpiry_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/metric" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/fftls/config.go b/pkg/fftls/config.go index 9e0dbdbe..426382b4 100644 --- a/pkg/fftls/config.go +++ b/pkg/fftls/config.go @@ -17,7 +17,7 @@ package fftls import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/pkg/fftls/fftls.go b/pkg/fftls/fftls.go index 034b7e10..520ffe2b 100644 --- a/pkg/fftls/fftls.go +++ b/pkg/fftls/fftls.go @@ -26,10 +26,10 @@ import ( "regexp" "strings" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/metric" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/metric" ) type TLSType string diff --git a/pkg/fftls/fftls_test.go b/pkg/fftls/fftls_test.go index 57db9bdf..98f46a92 100644 --- a/pkg/fftls/fftls_test.go +++ b/pkg/fftls/fftls_test.go @@ -33,7 +33,7 @@ import ( "time" "io" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/fftypes/bigint.go b/pkg/fftypes/bigint.go index b4183950..39c046f4 100644 --- a/pkg/fftypes/bigint.go +++ b/pkg/fftypes/bigint.go @@ -22,7 +22,7 @@ import ( "encoding/json" "math/big" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) const MaxFFBigIntHexLength = 65 diff --git a/pkg/fftypes/bytetypes.go b/pkg/fftypes/bytetypes.go index 6c3bfa00..df82abc9 100644 --- a/pkg/fftypes/bytetypes.go +++ b/pkg/fftypes/bytetypes.go @@ -25,7 +25,7 @@ import ( "hash" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // Bytes32 is a holder of a hash, that can be used to correlate onchain data with off-chain data. diff --git a/pkg/fftypes/enum.go b/pkg/fftypes/enum.go index 0744ba0c..0aa187f9 100644 --- a/pkg/fftypes/enum.go +++ b/pkg/fftypes/enum.go @@ -21,8 +21,8 @@ import ( "database/sql/driver" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) type FFEnum string diff --git a/pkg/fftypes/ffi.go b/pkg/fftypes/ffi.go index 65e1e1ab..0a055c52 100644 --- a/pkg/fftypes/ffi.go +++ b/pkg/fftypes/ffi.go @@ -21,7 +21,7 @@ import ( "database/sql/driver" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "github.com/santhosh-tekuri/jsonschema/v5" ) diff --git a/pkg/fftypes/int.go b/pkg/fftypes/int.go index 0771b716..92c32925 100644 --- a/pkg/fftypes/int.go +++ b/pkg/fftypes/int.go @@ -22,7 +22,7 @@ import ( "math/big" "strconv" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // FFuint64 on the API are serialized as Base10 strings, and can be parsed from multiple bases diff --git a/pkg/fftypes/jsonany.go b/pkg/fftypes/jsonany.go index 7e3bfdaa..97a31944 100644 --- a/pkg/fftypes/jsonany.go +++ b/pkg/fftypes/jsonany.go @@ -23,8 +23,8 @@ import ( "encoding/json" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) const ( diff --git a/pkg/fftypes/jsonobject.go b/pkg/fftypes/jsonobject.go index da9185ee..e4c4fa72 100644 --- a/pkg/fftypes/jsonobject.go +++ b/pkg/fftypes/jsonobject.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) // JSONObject is a holder of a hash, that can be used to correlate onchain data with off-chain data. diff --git a/pkg/fftypes/jsonobjectarray.go b/pkg/fftypes/jsonobjectarray.go index 353543b7..fb715b9d 100644 --- a/pkg/fftypes/jsonobjectarray.go +++ b/pkg/fftypes/jsonobjectarray.go @@ -22,7 +22,7 @@ import ( "database/sql/driver" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // JSONObjectArray is an array of JSONObject diff --git a/pkg/fftypes/jsonscan.go b/pkg/fftypes/jsonscan.go index a40f9974..99849e70 100644 --- a/pkg/fftypes/jsonscan.go +++ b/pkg/fftypes/jsonscan.go @@ -21,7 +21,7 @@ import ( "database/sql/driver" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) func JSONScan(src, target interface{}) error { diff --git a/pkg/fftypes/sentinal_errors.go b/pkg/fftypes/sentinal_errors.go index 829667b7..09223c3e 100644 --- a/pkg/fftypes/sentinal_errors.go +++ b/pkg/fftypes/sentinal_errors.go @@ -19,7 +19,7 @@ package fftypes import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) var ( diff --git a/pkg/fftypes/sizeutils.go b/pkg/fftypes/sizeutils.go index 68400f4b..8987e9a5 100644 --- a/pkg/fftypes/sizeutils.go +++ b/pkg/fftypes/sizeutils.go @@ -20,7 +20,7 @@ import ( "context" "github.com/docker/go-units" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/log" ) // ParseToByteSize is a standard handling of a number of bytes, in config or API options diff --git a/pkg/fftypes/stringarray.go b/pkg/fftypes/stringarray.go index c4734af9..2aef9cae 100644 --- a/pkg/fftypes/stringarray.go +++ b/pkg/fftypes/stringarray.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // FFStringArray is an array of strings, each conforming to the requirements of a FireFly name diff --git a/pkg/fftypes/timeutils.go b/pkg/fftypes/timeutils.go index de8db532..d000e545 100644 --- a/pkg/fftypes/timeutils.go +++ b/pkg/fftypes/timeutils.go @@ -23,8 +23,8 @@ import ( "strconv" "time" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) // FFTime is serialized to JSON on the API in RFC3339 nanosecond UTC time diff --git a/pkg/fftypes/uuid.go b/pkg/fftypes/uuid.go index 7b802783..eddc14aa 100644 --- a/pkg/fftypes/uuid.go +++ b/pkg/fftypes/uuid.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/google/uuid" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // UUID is a wrapper on a UUID implementation, ensuring Value handles nil diff --git a/pkg/fftypes/validations.go b/pkg/fftypes/validations.go index ac56f702..285b55f0 100644 --- a/pkg/fftypes/validations.go +++ b/pkg/fftypes/validations.go @@ -20,7 +20,7 @@ import ( "context" "regexp" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) var ( diff --git a/pkg/fswatcher/fswatcher.go b/pkg/fswatcher/fswatcher.go index 3fa7e236..cfeedd9a 100644 --- a/pkg/fswatcher/fswatcher.go +++ b/pkg/fswatcher/fswatcher.go @@ -23,9 +23,9 @@ import ( "time" "github.com/fsnotify/fsnotify" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) // Listens for changes to the specified file. diff --git a/pkg/httpserver/config.go b/pkg/httpserver/config.go index 8f8f72b9..eae4763f 100644 --- a/pkg/httpserver/config.go +++ b/pkg/httpserver/config.go @@ -19,9 +19,9 @@ package httpserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/auth/authfactory" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/auth/authfactory" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" ) const ( diff --git a/pkg/httpserver/debugserver.go b/pkg/httpserver/debugserver.go index 348cc115..cb2eb82c 100644 --- a/pkg/httpserver/debugserver.go +++ b/pkg/httpserver/debugserver.go @@ -25,8 +25,8 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/log" ) func RunDebugServer(ctx context.Context, debugServerConf config.Section, captureAddr ...func(addr net.Addr)) { diff --git a/pkg/httpserver/debugserver_test.go b/pkg/httpserver/debugserver_test.go index 5f8cabdf..092a3019 100644 --- a/pkg/httpserver/debugserver_test.go +++ b/pkg/httpserver/debugserver_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/httpserver/httpserver.go b/pkg/httpserver/httpserver.go index 128fad89..dd38bee2 100644 --- a/pkg/httpserver/httpserver.go +++ b/pkg/httpserver/httpserver.go @@ -24,11 +24,11 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) type remoteAddrContextKey struct{} diff --git a/pkg/httpserver/httpserver_test.go b/pkg/httpserver/httpserver_test.go index 1f85e378..bd4e9f67 100644 --- a/pkg/httpserver/httpserver_test.go +++ b/pkg/httpserver/httpserver_test.go @@ -35,10 +35,10 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/mocks/httpservermocks" - "github.com/hyperledger/firefly-common/pkg/auth/basic" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" + "github.com/hyperledger-firefly/common/mocks/httpservermocks" + "github.com/hyperledger-firefly/common/pkg/auth/basic" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/httpserver/server_auth.go b/pkg/httpserver/server_auth.go index c393187c..80bd6cad 100644 --- a/pkg/httpserver/server_auth.go +++ b/pkg/httpserver/server_auth.go @@ -20,9 +20,9 @@ import ( "context" "net/http" - "github.com/hyperledger/firefly-common/pkg/auth" - "github.com/hyperledger/firefly-common/pkg/auth/authfactory" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/auth" + "github.com/hyperledger-firefly/common/pkg/auth/authfactory" + "github.com/hyperledger-firefly/common/pkg/config" ) func wrapAuthIfEnabled(ctx context.Context, conf config.Section, pluginName string, chain http.Handler) (http.Handler, error) { diff --git a/pkg/httpserver/server_auth_test.go b/pkg/httpserver/server_auth_test.go index ed296382..6365dc2d 100644 --- a/pkg/httpserver/server_auth_test.go +++ b/pkg/httpserver/server_auth_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/auth/basic" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/auth/basic" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/httpserver/server_cors.go b/pkg/httpserver/server_cors.go index bd5dabc9..1169afac 100644 --- a/pkg/httpserver/server_cors.go +++ b/pkg/httpserver/server_cors.go @@ -20,8 +20,8 @@ import ( "context" "net/http" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/rs/cors" ) diff --git a/pkg/httpserver/server_cors_test.go b/pkg/httpserver/server_cors_test.go index a75bd416..4b090cd9 100644 --- a/pkg/httpserver/server_cors_test.go +++ b/pkg/httpserver/server_cors_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/i18n/es/es_base_config_descriptions.go b/pkg/i18n/es/es_base_config_descriptions.go index 66d022ef..89f82641 100644 --- a/pkg/i18n/es/es_base_config_descriptions.go +++ b/pkg/i18n/es/es_base_config_descriptions.go @@ -17,7 +17,7 @@ package es import ( - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/pkg/metric/metric.go b/pkg/metric/metric.go index 8de7ccbb..5424f7bf 100644 --- a/pkg/metric/metric.go +++ b/pkg/metric/metric.go @@ -22,7 +22,7 @@ import ( "regexp" "sync" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/pkg/metric/prometheusMetricsManager.go b/pkg/metric/prometheusMetricsManager.go index fd01b5b3..2c053a0b 100644 --- a/pkg/metric/prometheusMetricsManager.go +++ b/pkg/metric/prometheusMetricsManager.go @@ -21,8 +21,8 @@ import ( "regexp" "strings" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/retry/config.go b/pkg/retry/config.go index dac8937f..c6d73a51 100644 --- a/pkg/retry/config.go +++ b/pkg/retry/config.go @@ -17,7 +17,7 @@ package retry import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/pkg/retry/config_test.go b/pkg/retry/config_test.go index c58436cc..ce76af57 100644 --- a/pkg/retry/config_test.go +++ b/pkg/retry/config_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "gotest.tools/assert" ) diff --git a/pkg/retry/retry.go b/pkg/retry/retry.go index 3e2ae885..9b9eaee5 100644 --- a/pkg/retry/retry.go +++ b/pkg/retry/retry.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) const ( diff --git a/pkg/version/version.go b/pkg/version/version.go index 80277064..aaea8584 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -23,8 +23,8 @@ import ( "runtime/debug" "github.com/ghodss/yaml" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" "github.com/spf13/cobra" ) diff --git a/pkg/wsclient/wsclient.go b/pkg/wsclient/wsclient.go index bf082cec..e58bcb5c 100644 --- a/pkg/wsclient/wsclient.go +++ b/pkg/wsclient/wsclient.go @@ -30,11 +30,11 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" "golang.org/x/time/rate" ) diff --git a/pkg/wsclient/wsconfig.go b/pkg/wsclient/wsconfig.go index 1d3d0fd3..41974f80 100644 --- a/pkg/wsclient/wsconfig.go +++ b/pkg/wsclient/wsconfig.go @@ -20,11 +20,11 @@ import ( "context" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffdns" - "github.com/hyperledger/firefly-common/pkg/ffnet" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffdns" + "github.com/hyperledger-firefly/common/pkg/ffnet" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" ) const ( diff --git a/pkg/wsclient/wsconfig_test.go b/pkg/wsclient/wsconfig_test.go index e49986a2..e0d4aa49 100644 --- a/pkg/wsclient/wsconfig_test.go +++ b/pkg/wsclient/wsconfig_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffdns" - "github.com/hyperledger/firefly-common/pkg/ffnet" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffdns" + "github.com/hyperledger-firefly/common/pkg/ffnet" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/wsserver/config.go b/pkg/wsserver/config.go index 5ecf1f09..4108caa9 100644 --- a/pkg/wsserver/config.go +++ b/pkg/wsserver/config.go @@ -19,7 +19,7 @@ package wsserver import ( "time" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) type WebSocketServerConfig struct { diff --git a/pkg/wsserver/config_test.go b/pkg/wsserver/config_test.go index 700a590d..95bb1da7 100644 --- a/pkg/wsserver/config_test.go +++ b/pkg/wsserver/config_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "gotest.tools/assert" ) diff --git a/pkg/wsserver/wsconn.go b/pkg/wsserver/wsconn.go index c160130b..02b56b2a 100644 --- a/pkg/wsserver/wsconn.go +++ b/pkg/wsserver/wsconn.go @@ -22,9 +22,9 @@ import ( "sync" ws "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) type webSocketConnection struct { diff --git a/pkg/wsserver/wsserver.go b/pkg/wsserver/wsserver.go index 28c9e5fb..c8ec570f 100644 --- a/pkg/wsserver/wsserver.go +++ b/pkg/wsserver/wsserver.go @@ -22,8 +22,8 @@ import ( "sync" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) // The Protocol interface layers a protocol on top of raw websockets, that allows the server side to: diff --git a/pkg/wsserver/wsserver_test.go b/pkg/wsserver/wsserver_test.go index 14452feb..b697fb14 100644 --- a/pkg/wsserver/wsserver_test.go +++ b/pkg/wsserver/wsserver_test.go @@ -25,7 +25,7 @@ import ( "time" ws "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert"