Fix wartns

whisperfish · Oct 24, 2024 · c5fba7b · c5fba7b
1 parent 21a9c78
commit c5fba7b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/presage-cli/Cargo.toml b/presage-cli/Cargo.toml
@@ -8,7 +8,6 @@ license = "AGPL-3.0-only"
 [dependencies]
 presage = { path = "../presage" }
 presage-store-sled = { path = "../presage-store-sled" }
-presage-store-sqlite = { path = "../presage-store-sqlite" }
 
 anyhow = { version = "1.0", features = ["backtrace"] }
 base64 = "0.22"

diff --git a/presage-cli/src/main.rs b/presage-cli/src/main.rs
@@ -27,6 +27,7 @@ use presage::libsignal_service::ServiceAddress;
 use presage::manager::ReceivingMode;
 use presage::model::contacts::Contact;
 use presage::model::groups::Group;
+use presage::model::identity::OnNewIdentity;
 use presage::proto::receipt_message;
 use presage::proto::EditMessage;
 use presage::proto::ReceiptMessage;
@@ -39,9 +40,7 @@ use presage::{
     Manager,
 };
 use presage_store_sled::MigrationConflictStrategy;
-use presage_store_sled::OnNewIdentity;
 use presage_store_sled::SledStore;
-use presage_store_sqlite::SqliteStore;
 use tempfile::Builder;
 use tokio::task;
 use tokio::{
@@ -225,7 +224,13 @@ async fn main() -> anyhow::Result<()> {
             .into()
     });
     debug!(db_path =% db_path.display(), "opening config database");
-    let config_store = SqliteStore::open(db_path, OnNewIdentity::Trust).await?;
+    let config_store = SledStore::open_with_passphrase(
+        db_path,
+        args.passphrase,
+        MigrationConflictStrategy::Raise,
+        OnNewIdentity::Trust,
+    )
+    .await?;
     run(args.subcommand, config_store).await
 }
 

diff --git a/presage-store-sqlite/src/content.rs b/presage-store-sqlite/src/content.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use presage::{
     libsignal_service::{prelude::Content, zkgroup::GroupMasterKeyBytes},
     model::{contacts::Contact, groups::Group},
-    store::{ContentsStore, Sticker, StickerPack},
+    store::{ContentsStore, StickerPack},
 };
 
 use crate::{SqliteStore, SqliteStoreError};

diff --git a/presage-store-sqlite/src/lib.rs b/presage-store-sqlite/src/lib.rs
@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use presage::{
     model::identity::OnNewIdentity,
@@ -7,13 +7,16 @@ use presage::{
 use protocol::SqliteProtocolStore;
 use sqlx::{sqlite::SqliteConnectOptions, SqlitePool};
 
+#[allow(unused)]
 mod content;
 mod error;
+#[allow(unused)]
 mod protocol;
 
 pub use error::SqliteStoreError;
 
 #[derive(Debug, Clone)]
+#[allow(unused)]
 pub struct SqliteStore {
     db: SqlitePool,
     /// Whether to trust new identities automatically (for instance, when a somebody's phone has changed)

diff --git a/presage-store-sqlite/src/protocol.rs b/presage-store-sqlite/src/protocol.rs
@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use presage::libsignal_service::{
@@ -18,6 +16,7 @@ use presage::libsignal_service::{
 use crate::SqliteStore;
 
 #[derive(Clone)]
+#[allow(dead_code)]
 pub struct SqliteProtocolStore {
     pub(crate) store: SqliteStore,
 }