Skip to content

Commit

Permalink
Merge branch 'main' into feat-union-proof-type-relevents
Browse files Browse the repository at this point in the history
  • Loading branch information
smtmfft authored Nov 28, 2024
2 parents 41ddd2d + 89f748f commit ef5e03d
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 1,161 deletions.
44 changes: 1 addition & 43 deletions Cargo.lock

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

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ anyhow = "1.0"
thiserror = "1.0"
thiserror-no-std = "2.0.2"

# SQLite
rusqlite = { version = "0.31.0", features = ["bundled"] }

# redis
redis = { version = "=0.27.3" }

Expand Down
6 changes: 0 additions & 6 deletions host/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ pub struct Opts {
/// Set jwt secret for auth
pub jwt_secret: Option<String>,

#[arg(long, require_equals = true, default_value = "raiko.sqlite")]
/// Set the path to the sqlite db file
pub sqlite_file: PathBuf,

#[arg(long, require_equals = true, default_value = "1048576")]
pub max_db_size: usize,

Expand Down Expand Up @@ -132,7 +128,6 @@ impl Opts {
impl From<Opts> for TaskManagerOpts {
fn from(val: Opts) -> Self {
Self {
sqlite_file: val.sqlite_file,
max_db_size: val.max_db_size,
redis_url: val.redis_url.to_string(),
redis_ttl: val.redis_ttl,
Expand All @@ -143,7 +138,6 @@ impl From<Opts> for TaskManagerOpts {
impl From<&Opts> for TaskManagerOpts {
fn from(val: &Opts) -> Self {
Self {
sqlite_file: val.sqlite_file.clone(),
max_db_size: val.max_db_size,
redis_url: val.redis_url.to_string(),
redis_ttl: val.redis_ttl,
Expand Down
3 changes: 0 additions & 3 deletions taskdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2021"
[dependencies]
raiko-lib = { workspace = true }
raiko-core = { workspace = true }
rusqlite = { workspace = true, features = ["chrono"], optional = true }
num_enum = { workspace = true }
chrono = { workspace = true, features = ["serde"] }
thiserror = { workspace = true }
Expand All @@ -26,11 +25,9 @@ rand = "0.9.0-alpha.1" # This is an a
rand_chacha = "0.9.0-alpha.1"
tempfile = "3.10.1"
alloy-primitives = { workspace = true, features = ["getrandom"] }
rusqlite = { workspace = true, features = ["trace"] }

[features]
default = []
sqlite = ["rusqlite"]
in-memory = []
redis-db = ["redis"]

Expand Down
Loading

0 comments on commit ef5e03d

Please sign in to comment.