From f664a76504c5931b32ebfcd1545e2e6dff6159dd Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 5 Apr 2021 08:12:10 -0400
Subject: [PATCH] Upgrade rusqlite; remove needless usage.

---
 tor-dirmgr/Cargo.toml            |  2 +-
 tor-dirmgr/src/storage/sqlite.rs | 36 +++++++++++++-------------------
 tor-netdir/Cargo.toml            |  1 -
 tor-netdir/src/err.rs            |  6 ------
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/tor-dirmgr/Cargo.toml b/tor-dirmgr/Cargo.toml
index 85dc8f02f..242687b5f 100644
--- a/tor-dirmgr/Cargo.toml
+++ b/tor-dirmgr/Cargo.toml
@@ -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"
diff --git a/tor-dirmgr/src/storage/sqlite.rs b/tor-dirmgr/src/storage/sqlite.rs
index a12306612..b5932adb7 100644
--- a/tor-dirmgr/src/storage/sqlite.rs
+++ b/tor-dirmgr/src/storage/sqlite.rs
@@ -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(())
diff --git a/tor-netdir/Cargo.toml b/tor-netdir/Cargo.toml
index d89146e63..11a702461 100644
--- a/tor-netdir/Cargo.toml
+++ b/tor-netdir/Cargo.toml
@@ -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"
diff --git a/tor-netdir/src/err.rs b/tor-netdir/src/err.rs
index a9948e26a..33c1c4fa2 100644
--- a/tor-netdir/src/err.rs
+++ b/tor-netdir/src/err.rs
@@ -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,