vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade rusqlite; remove needless usage.

This commit is contained in:
Nick Mathewson 2021-04-05 08:12:10 -04:00
parent 98c0ef3dd5
commit f664a76504
4 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tor-dirmgr/Cargo.toml
View File

@ -40,7 +40,7 @@ hex = "0.4.3"
log = "0.4.14"
memmap = { version="0.7.0", optional=true }
rand = "0.8.3"
rusqlite = { version = "0.24.2", features = ["chrono"] }
rusqlite = { version = "0.25.0", features = ["chrono"] }
serde = { version = "1.0.124", features = ["derive"] }
thiserror = "1.0.24"
humantime-serde = "1.0.1"

36
tor-dirmgr/src/storage/sqlite.rs
View File

@ -20,7 +20,7 @@ use std::time::SystemTime;
use anyhow::Context;
use chrono::prelude::*;
use chrono::Duration as CDuration;
use rusqlite::{params, OpenFlags, OptionalExtension, Transaction, NO_PARAMS};
use rusqlite::{params, OpenFlags, OptionalExtension, Transaction};
#[cfg(target_family = "unix")]
use std::os::unix::fs::DirBuilderExt;
@ -153,7 +153,7 @@ impl SqliteStore {
"SELECT COUNT(name) FROM sqlite_master
WHERE type='table'
AND name NOT LIKE 'sqlite_%'",
NO_PARAMS,
[],
|row| row.get(0),
)?;
let db_exists = db_n_tables > 0;
@ -168,7 +168,7 @@ impl SqliteStore {
let (version, readable_by): (u32, u32) = tx.query_row(
"SELECT version, readable_by FROM TorSchemaMeta
WHERE name = 'TorDirStorage'",
NO_PARAMS,
[],
|row| Ok((row.get(0)?, row.get(1)?)),
)?;
@ -194,17 +194,17 @@ impl SqliteStore {
let expired_blobs: Vec<String> = {
let mut stmt = tx.prepare(FIND_EXPIRED_EXTDOCS)?;
let names = stmt
.query_map(NO_PARAMS, |row| row.get::<_, String>(0))?
.query_map([], |row| row.get::<_, String>(0))?
.filter_map(std::result::Result::ok)
.collect();
names
};
tx.execute(DROP_OLD_EXTDOCS, NO_PARAMS)?;
tx.execute(DROP_OLD_MICRODESCS, NO_PARAMS)?;
tx.execute(DROP_OLD_AUTHCERTS, NO_PARAMS)?;
tx.execute(DROP_OLD_CONSENSUSES, NO_PARAMS)?;
tx.execute(DROP_OLD_ROUTERDESCS, NO_PARAMS)?;
tx.execute(DROP_OLD_EXTDOCS, [])?;
tx.execute(DROP_OLD_MICRODESCS, [])?;
tx.execute(DROP_OLD_AUTHCERTS, [])?;
tx.execute(DROP_OLD_CONSENSUSES, [])?;
tx.execute(DROP_OLD_ROUTERDESCS, [])?;
tx.commit()?;
for name in expired_blobs {
let fname = self.blob_fname(name);
@ -969,12 +969,9 @@ mod test {
b"Goodbye, dear friends"
);
let n: u32 =
store
.conn
.query_row("SELECT COUNT(filename) FROM ExtDocs", NO_PARAMS, |row| {
row.get(0)
})?;
let n: u32 = store
.conn
.query_row("SELECT COUNT(filename) FROM ExtDocs", [], |row| row.get(0))?;
assert_eq!(n, 2);
let blob = store.read_blob(&fname2)?;
@ -987,12 +984,9 @@ mod test {
b"Hello world"
);
assert!(std::fs::read(store.blob_fname(&fname2)?).is_err());
let n: u32 =
store
.conn
.query_row("SELECT COUNT(filename) FROM ExtDocs", NO_PARAMS, |row| {
row.get(0)
})?;
let n: u32 = store
.conn
.query_row("SELECT COUNT(filename) FROM ExtDocs", [], |row| row.get(0))?;
assert_eq!(n, 1);
Ok(())

1
tor-netdir/Cargo.toml
View File

@ -27,7 +27,6 @@ hex = "0.4.3"
log = "0.4.14"
once_cell = "1.7.2"
rand = "0.8.3"
rusqlite = { version = "0.24.2", features = ["chrono"] }
serde = { version = "1.0.124", features = ["derive"] }
signature = "1.3.0"
thiserror = "1.0.24"

6
tor-netdir/src/err.rs
View File

@ -27,12 +27,6 @@ pub enum Error {
/// able to read.
#[error("corrupt cache: {0}")]
CacheCorruption(&'static str),
/// rusqlite gave us an error.
#[error("sqlite error: {0}")]
SqliteError(#[from] rusqlite::Error),
/// A schema version that says we can't read it.
#[error("unrecognized data storage schema")]
UnrecognizedSchema,
/// We don't have enough directory info to build circuits
#[error("not enough directory information to build circuits")]
NotEnoughInfo,