diff --git a/autopilot/accounts.go b/autopilot/accounts.go index e96f75b07..2a08a170a 100644 --- a/autopilot/accounts.go +++ b/autopilot/accounts.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/otel/codes" "go.sia.tech/core/types" "go.sia.tech/renterd/api" - "go.sia.tech/renterd/internal/tracing" + "go.sia.tech/renterd/tracing" "go.uber.org/zap" ) diff --git a/autopilot/autopilot.go b/autopilot/autopilot.go index 067426842..de68de812 100644 --- a/autopilot/autopilot.go +++ b/autopilot/autopilot.go @@ -15,8 +15,8 @@ import ( "go.sia.tech/jape" "go.sia.tech/renterd/api" "go.sia.tech/renterd/hostdb" - "go.sia.tech/renterd/internal/tracing" "go.sia.tech/renterd/object" + "go.sia.tech/renterd/tracing" "go.sia.tech/renterd/wallet" "go.uber.org/zap" "lukechampine.com/frand" diff --git a/autopilot/contractor.go b/autopilot/contractor.go index 8b566e36e..bc5ab0083 100644 --- a/autopilot/contractor.go +++ b/autopilot/contractor.go @@ -16,7 +16,7 @@ import ( "go.sia.tech/core/types" "go.sia.tech/renterd/api" "go.sia.tech/renterd/hostdb" - "go.sia.tech/renterd/internal/tracing" + "go.sia.tech/renterd/tracing" "go.sia.tech/renterd/wallet" "go.sia.tech/renterd/worker" "go.uber.org/zap" diff --git a/autopilot/migrator.go b/autopilot/migrator.go index ac2f68f44..14e4e46e8 100644 --- a/autopilot/migrator.go +++ b/autopilot/migrator.go @@ -6,7 +6,7 @@ import ( "sync" "go.sia.tech/renterd/api" - "go.sia.tech/renterd/internal/tracing" + "go.sia.tech/renterd/tracing" "go.uber.org/zap" ) diff --git a/bus/bus.go b/bus/bus.go index fc1e1413b..b79f336ec 100644 --- a/bus/bus.go +++ b/bus/bus.go @@ -17,8 +17,8 @@ import ( "go.sia.tech/jape" "go.sia.tech/renterd/api" "go.sia.tech/renterd/hostdb" - "go.sia.tech/renterd/internal/tracing" "go.sia.tech/renterd/object" + "go.sia.tech/renterd/tracing" "go.sia.tech/renterd/wallet" "go.uber.org/zap" ) diff --git a/cmd/renterd/main.go b/cmd/renterd/main.go index fa9f4bd14..1731b06dc 100644 --- a/cmd/renterd/main.go +++ b/cmd/renterd/main.go @@ -20,8 +20,8 @@ import ( "go.sia.tech/renterd/build" "go.sia.tech/renterd/bus" "go.sia.tech/renterd/internal/node" - "go.sia.tech/renterd/internal/stores" - "go.sia.tech/renterd/internal/tracing" + "go.sia.tech/renterd/stores" + "go.sia.tech/renterd/tracing" "go.sia.tech/renterd/wallet" "go.sia.tech/renterd/worker" "golang.org/x/term" diff --git a/go.sum b/go.sum index d8b041e5c..8bb3ee880 100644 --- a/go.sum +++ b/go.sum @@ -328,8 +328,6 @@ go.sia.tech/mux v1.2.0 h1:ofa1Us9mdymBbGMY2XH/lSpY8itFsKIo/Aq8zwe+GHU= go.sia.tech/mux v1.2.0/go.mod h1:Yyo6wZelOYTyvrHmJZ6aQfRoer3o4xyKQ4NmQLJrBSo= go.sia.tech/siad v1.5.10-0.20230228235644-3059c0b930ca h1:aZMg2AKevn7jKx+wlusWQfwSM5pNU9aGtRZme29q3O4= go.sia.tech/siad v1.5.10-0.20230228235644-3059c0b930ca/go.mod h1:h/1afFwpxzff6/gG5i1XdAgPK7dEY6FaibhK7N5F86Y= -go.sia.tech/web/renterd v0.12.0 h1:Ic9MTgBh9rInUEqUPYTYQZa3LcVHgRrEy23pxJmOAyQ= -go.sia.tech/web/renterd v0.12.0/go.mod h1:jr4PVQW1KU8JpAzmJRfFecDeJ5SPIRrKM3OKZ+FvGvE= go.sia.tech/web/renterd v0.13.0 h1:wG02yiwrS5PPCELHlPMqZ5sMO0+11V6T73941mJrfqY= go.sia.tech/web/renterd v0.13.0/go.mod h1:jr4PVQW1KU8JpAzmJRfFecDeJ5SPIRrKM3OKZ+FvGvE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/internal/node/node.go b/internal/node/node.go index 9e976f590..edbd1ee6f 100644 --- a/internal/node/node.go +++ b/internal/node/node.go @@ -16,7 +16,7 @@ import ( "go.sia.tech/core/types" "go.sia.tech/renterd/autopilot" "go.sia.tech/renterd/bus" - "go.sia.tech/renterd/internal/stores" + "go.sia.tech/renterd/stores" "go.sia.tech/renterd/wallet" "go.sia.tech/renterd/worker" "go.sia.tech/siad/modules" diff --git a/internal/testing/cluster.go b/internal/testing/cluster.go index c2f685b54..307832dfb 100644 --- a/internal/testing/cluster.go +++ b/internal/testing/cluster.go @@ -20,7 +20,7 @@ import ( "go.sia.tech/renterd/autopilot" "go.sia.tech/renterd/bus" "go.sia.tech/renterd/internal/node" - "go.sia.tech/renterd/internal/stores" + "go.sia.tech/renterd/stores" "go.uber.org/zap" "gorm.io/gorm" "lukechampine.com/frand" diff --git a/internal/stores/accounts.go b/stores/accounts.go similarity index 100% rename from internal/stores/accounts.go rename to stores/accounts.go diff --git a/internal/stores/autopilot.go b/stores/autopilot.go similarity index 100% rename from internal/stores/autopilot.go rename to stores/autopilot.go diff --git a/internal/stores/hostdb.go b/stores/hostdb.go similarity index 100% rename from internal/stores/hostdb.go rename to stores/hostdb.go diff --git a/internal/stores/hostdb_test.go b/stores/hostdb_test.go similarity index 100% rename from internal/stores/hostdb_test.go rename to stores/hostdb_test.go diff --git a/internal/stores/logger.go b/stores/logger.go similarity index 100% rename from internal/stores/logger.go rename to stores/logger.go diff --git a/internal/stores/metadata.go b/stores/metadata.go similarity index 100% rename from internal/stores/metadata.go rename to stores/metadata.go diff --git a/internal/stores/metadata_test.go b/stores/metadata_test.go similarity index 100% rename from internal/stores/metadata_test.go rename to stores/metadata_test.go diff --git a/internal/stores/settingsdb.go b/stores/settingsdb.go similarity index 100% rename from internal/stores/settingsdb.go rename to stores/settingsdb.go diff --git a/internal/stores/settingsdb_test.go b/stores/settingsdb_test.go similarity index 100% rename from internal/stores/settingsdb_test.go rename to stores/settingsdb_test.go diff --git a/internal/stores/sql.go b/stores/sql.go similarity index 100% rename from internal/stores/sql.go rename to stores/sql.go diff --git a/internal/stores/sql_test.go b/stores/sql_test.go similarity index 100% rename from internal/stores/sql_test.go rename to stores/sql_test.go diff --git a/internal/stores/types.go b/stores/types.go similarity index 100% rename from internal/stores/types.go rename to stores/types.go diff --git a/internal/stores/wallet.go b/stores/wallet.go similarity index 100% rename from internal/stores/wallet.go rename to stores/wallet.go diff --git a/internal/tracing/tracing.go b/tracing/tracing.go similarity index 100% rename from internal/tracing/tracing.go rename to tracing/tracing.go diff --git a/worker/sessionpool.go b/worker/sessionpool.go index 4d95bb6d1..7dfc43ccc 100644 --- a/worker/sessionpool.go +++ b/worker/sessionpool.go @@ -9,7 +9,7 @@ import ( rhpv2 "go.sia.tech/core/rhp/v2" "go.sia.tech/core/types" - "go.sia.tech/renterd/internal/tracing" + "go.sia.tech/renterd/tracing" ) func (s *Session) appendSector(ctx context.Context, sector *[rhpv2.SectorSize]byte, currentHeight uint64) (types.Hash256, error) { diff --git a/worker/spending.go b/worker/spending.go index 286236e38..65b3b1403 100644 --- a/worker/spending.go +++ b/worker/spending.go @@ -8,7 +8,7 @@ import ( "go.sia.tech/core/types" "go.sia.tech/renterd/api" - "go.sia.tech/renterd/internal/tracing" + "go.sia.tech/renterd/tracing" "go.uber.org/zap" ) diff --git a/worker/transfer.go b/worker/transfer.go index 2dfcfd557..8799be076 100644 --- a/worker/transfer.go +++ b/worker/transfer.go @@ -14,8 +14,8 @@ import ( rhpv2 "go.sia.tech/core/rhp/v2" "go.sia.tech/core/types" "go.sia.tech/renterd/api" - "go.sia.tech/renterd/internal/tracing" "go.sia.tech/renterd/object" + "go.sia.tech/renterd/tracing" "go.uber.org/zap" "lukechampine.com/frand" ) diff --git a/worker/worker.go b/worker/worker.go index d3cbf6cf9..d3cf40885 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -27,9 +27,9 @@ import ( "go.sia.tech/jape" "go.sia.tech/renterd/api" "go.sia.tech/renterd/hostdb" - "go.sia.tech/renterd/internal/tracing" "go.sia.tech/renterd/metrics" "go.sia.tech/renterd/object" + "go.sia.tech/renterd/tracing" "go.sia.tech/siad/modules" "go.uber.org/zap" "golang.org/x/crypto/blake2b"