commit 8e3e2d39aa045cde0689b0f8e3174035bcf3a6f3
parent 67a76ffea8721f663114f5c1045b904dbaa35556
Author: triesap <tyson@radroots.org>
Date: Fri, 20 Mar 2026 14:29:26 +0000
core: use replica crate names directly
Diffstat:
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -107,9 +107,9 @@ once_cell = "1"
radroots-nostr = { path = "../lib/crates/nostr" }
radroots-types = { path = "../lib/crates/types" }
radroots-sql-core = { path = "../lib/crates/sql-core" }
-radroots-tangle-db = { package = "radroots-replica-db", path = "../lib/crates/replica-db" }
-radroots-tangle-db-schema = { package = "radroots-replica-db-schema", path = "../lib/crates/replica-db-schema" }
-radroots-tangle-events = { package = "radroots-replica-sync", path = "../lib/crates/replica-sync" }
+radroots-replica-db = { path = "../lib/crates/replica-db" }
+radroots-replica-db-schema = { path = "../lib/crates/replica-db-schema" }
+radroots-replica-sync = { path = "../lib/crates/replica-sync" }
mf2-i18n-core = { path = "../../../../vendor/triesap/mf2-i18n/crates/mf2-i18n-core" }
mf2-i18n-embedded = { path = "../../../../vendor/triesap/mf2-i18n/crates/mf2-i18n-embedded" }
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -24,9 +24,9 @@ sha2 = { workspace = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
rusqlite = { workspace = true, features = ["bundled", "serialize"] }
radroots-sql-core = { workspace = true, features = ["native"] }
-radroots-tangle-db = { workspace = true }
-radroots-tangle-db-schema = { workspace = true }
-radroots-tangle-events = { workspace = true }
+radroots-replica-db = { workspace = true }
+radroots-replica-db-schema = { workspace = true }
+radroots-replica-sync = { workspace = true }
[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = { workspace = true }
diff --git a/crates/core/src/tangle/types.rs b/crates/core/src/tangle/types.rs
@@ -2,9 +2,9 @@ use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use serde_json::Value;
-use radroots_tangle_db::backup::DatabaseBackup;
-use radroots_tangle_db::ReplicaDbExportManifestRs;
-pub use radroots_tangle_db_schema::{
+use radroots_replica_db::backup::DatabaseBackup;
+use radroots_replica_db::ReplicaDbExportManifestRs;
+pub use radroots_replica_db_schema::{
farm::*,
farm_gcs_location::*,
farm_member::*,
@@ -24,7 +24,7 @@ pub use radroots_tangle_db_schema::{
trade_product_location::*,
trade_product_media::*,
};
-use radroots_tangle_events::{RadrootsReplicaEventDraft, RadrootsReplicaSyncBundle};
+use radroots_replica_sync::{RadrootsReplicaEventDraft, RadrootsReplicaSyncBundle};
use crate::idb::RadrootsClientIdbConfig;
use crate::sql::{RadrootsClientSqlCipherConfig, RadrootsClientSqlMigrationState};
diff --git a/crates/core/src/tangle/web.rs b/crates/core/src/tangle/web.rs
@@ -16,10 +16,10 @@ use radroots_nostr::prelude::{
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{ExecOutcome, SqlExecutor};
use radroots_sql_core::sqlite_util;
-use radroots_tangle_db::{export_manifest, ReplicaSql as TangleSql};
-use radroots_tangle_events::{
- radroots_replica_ingest_event as radroots_tangle_ingest_event,
- radroots_replica_sync_all as radroots_tangle_sync_all,
+use radroots_replica_db::{export_manifest, ReplicaSql};
+use radroots_replica_sync::{
+ radroots_replica_ingest_event,
+ radroots_replica_sync_all,
RadrootsReplicaEventDraft as RadrootsTangleEventDraft,
RadrootsReplicaFarmSelector as RadrootsTangleFarmSelector,
RadrootsReplicaSyncRequest as RadrootsTangleSyncRequest,
@@ -281,8 +281,8 @@ impl RadrootsClientWebTangle {
result
}
- fn tangle(&self, engine: &RadrootsClientWebSqlEngine) -> TangleSql<TangleSqlExecutor> {
- TangleSql::new(TangleSqlExecutor::new(engine.shared_connection()))
+ fn tangle(&self, engine: &RadrootsClientWebSqlEngine) -> ReplicaSql<TangleSqlExecutor> {
+ ReplicaSql::new(TangleSqlExecutor::new(engine.shared_connection()))
}
}
@@ -429,7 +429,7 @@ impl RadrootsClientTangle for RadrootsClientWebTangle {
},
options: None,
};
- let bundle = radroots_tangle_sync_all(tangle.executor(), &request)
+ let bundle = radroots_replica_sync_all(tangle.executor(), &request)
.map_err(|_| RadrootsClientTangleError::InvalidResponse)?;
for draft in bundle.events {
let key = tangle_sync_event_key(&draft);
@@ -460,7 +460,7 @@ impl RadrootsClientTangle for RadrootsClientWebTangle {
match publish_signed_event(&relays, secret_key, &event).await {
Ok(()) => {
let event = radroots_event_from_nostr(&event);
- match radroots_tangle_ingest_event(tangle.executor(), &event) {
+ match radroots_replica_ingest_event(tangle.executor(), &event) {
Ok(_) => events_published += 1,
Err(_) => events_failed += 1,
}