Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ quinn = { package = "iroh-quinn", version = "0.12", features = ["ring"] }
rand = "0.8"
range-collections = "0.4.0"
redb = { version = "2.2.0", optional = true }
redb_v1 = { package = "redb", version = "1.5.1", optional = true }
ref-cast = { version = "1.0.23", optional = true }
reflink-copy = { version = "0.1.8", optional = true }
self_cell = "1.0.1"
Expand Down Expand Up @@ -98,7 +97,7 @@ testdir = "0.9.1"
default = ["fs-store", "net_protocol"]
downloader = ["dep:parking_lot", "tokio-util/time", "dep:hashlink"]
net_protocol = ["downloader", "dep:futures-util"]
fs-store = ["dep:reflink-copy", "redb", "dep:redb_v1", "dep:tempfile"]
fs-store = ["dep:reflink-copy", "redb", "dep:tempfile"]
metrics = ["iroh-metrics/metrics"]
redb = ["dep:redb"]
cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console"]
Expand Down
5 changes: 3 additions & 2 deletions src/store/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ use smallvec::SmallVec;
use tokio::io::AsyncWriteExt;
use tracing::trace_span;

mod migrate_redb_v1_v2;
mod tables;
#[doc(hidden)]
pub mod test_support;
Expand Down Expand Up @@ -1510,7 +1509,9 @@ impl Actor {
let db = match redb::Database::create(path) {
Ok(db) => db,
Err(DatabaseError::UpgradeRequired(1)) => {
migrate_redb_v1_v2::run(path).map_err(ActorError::Migration)?
return Err(ActorError::Migration(anyhow::anyhow!(
"migration from v1 no longer supported"
)))
}
Err(err) => return Err(err.into()),
};
Expand Down
323 changes: 0 additions & 323 deletions src/store/fs/migrate_redb_v1_v2.rs

This file was deleted.

Loading