Rename go.mod from hyperledger/firefly-common to hyperledger-firefly/common

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)

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)

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:

go.mod

@@ -1,4 +1,4 @@
-module github.com/hyperledger/firefly-common
+module github.com/hyperledger-firefly/common
 
 go 1.23.0
 

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 (

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"
 )
 

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"
 )
 

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 (

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 {

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"
 )
 

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 {

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

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"
 

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"

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 (

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 (

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"
 )

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

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"

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 = "["

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"
 )
 

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

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

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"
 )
 

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"

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 {

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"
 )

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

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"
 )