diff --git a/config_dev.go b/config_dev.go index e52d4809..ffc26122 100644 --- a/config_dev.go +++ b/config_dev.go @@ -9,7 +9,7 @@ import ( "github.com/lightninglabs/lightning-terminal/accounts" "github.com/lightninglabs/lightning-terminal/db" - "github.com/lightninglabs/lightning-terminal/db/migstreams" + "github.com/lightninglabs/lightning-terminal/db/migsets" "github.com/lightninglabs/lightning-terminal/db/sqlc" "github.com/lightninglabs/lightning-terminal/firewalldb" "github.com/lightninglabs/lightning-terminal/session" @@ -119,7 +119,7 @@ func NewStores(ctx context.Context, cfg *Config, if !cfg.Sqlite.SkipMigrations { err = sqldb.ApplyAllMigrations( sqlStore, - migstreams.MakeMigrationSets( + migsets.MakeMigrationSets( ctx, basicClient, cfg.MacaroonPath, clock, ), @@ -165,7 +165,7 @@ func NewStores(ctx context.Context, cfg *Config, if !cfg.Postgres.SkipMigrations { err = sqldb.ApplyAllMigrations( sqlStore, - migstreams.MakeMigrationSets( + migsets.MakeMigrationSets( ctx, basicClient, cfg.MacaroonPath, clock, ), diff --git a/db/migrations.go b/db/migrations.go index 46609bdd..155ef403 100644 --- a/db/migrations.go +++ b/db/migrations.go @@ -27,7 +27,7 @@ const ( // MakeTestMigrationSets creates the migration sets for the unit test // environment. // -// NOTE: This function is not located in the migstreams package to avoid +// NOTE: This function is not located in the migsets package to avoid // cyclic dependencies. This test migration set does not run the kvdb to sql // migration, as we already have separate unit tests which tests the migration. func MakeTestMigrationSets() []sqldb.MigrationSet { diff --git a/db/migstreams/log.go b/db/migsets/log.go similarity index 97% rename from db/migstreams/log.go rename to db/migsets/log.go index 6aca4568..067c41fe 100644 --- a/db/migstreams/log.go +++ b/db/migsets/log.go @@ -1,4 +1,4 @@ -package migstreams +package migsets import ( "github.com/btcsuite/btclog/v2" diff --git a/db/migstreams/post_migration_callbacks_dev.go b/db/migsets/post_migration_callbacks_dev.go similarity index 99% rename from db/migstreams/post_migration_callbacks_dev.go rename to db/migsets/post_migration_callbacks_dev.go index 6eef7a0e..2dfef1c3 100644 --- a/db/migstreams/post_migration_callbacks_dev.go +++ b/db/migsets/post_migration_callbacks_dev.go @@ -1,6 +1,6 @@ //go:build dev -package migstreams +package migsets import ( "context" diff --git a/db/migstreams/sql_migrations.go b/db/migsets/sql_migrations.go similarity index 98% rename from db/migstreams/sql_migrations.go rename to db/migsets/sql_migrations.go index e0cda8fa..e4a71468 100644 --- a/db/migstreams/sql_migrations.go +++ b/db/migsets/sql_migrations.go @@ -1,6 +1,6 @@ //go:build !dev -package migstreams +package migsets import ( "context" diff --git a/db/migstreams/sql_migrations_dev.go b/db/migsets/sql_migrations_dev.go similarity index 99% rename from db/migstreams/sql_migrations_dev.go rename to db/migsets/sql_migrations_dev.go index bffbc152..eba0158e 100644 --- a/db/migstreams/sql_migrations_dev.go +++ b/db/migsets/sql_migrations_dev.go @@ -1,6 +1,6 @@ //go:build dev -package migstreams +package migsets import ( "context" diff --git a/log.go b/log.go index 8fe8de42..dedd74dc 100644 --- a/log.go +++ b/log.go @@ -8,7 +8,7 @@ import ( "github.com/lightninglabs/lightning-terminal/accounts" "github.com/lightninglabs/lightning-terminal/autopilotserver" "github.com/lightninglabs/lightning-terminal/db" - "github.com/lightninglabs/lightning-terminal/db/migstreams" + "github.com/lightninglabs/lightning-terminal/db/migsets" "github.com/lightninglabs/lightning-terminal/firewall" "github.com/lightninglabs/lightning-terminal/firewalldb" mid "github.com/lightninglabs/lightning-terminal/rpcmiddleware" @@ -94,10 +94,7 @@ func SetupLoggers(root *build.SubLoggerManager, intercept signal.Interceptor) { ) lnd.AddSubLogger(root, db.Subsystem, intercept, db.UseLogger) lnd.AddSubLogger(root, sqldb.Subsystem, intercept, sqldb.UseLogger) - lnd.AddSubLogger( - root, migstreams.Subsystem, intercept, - migstreams.UseLogger, - ) + lnd.AddSubLogger(root, migsets.Subsystem, intercept, migsets.UseLogger) // Add daemon loggers to lnd's root logger. faraday.SetupLoggers(root, intercept)