p2panda · sandreae · Aug 6, 2022 · Jul 10, 2022 · Jul 10, 2022 · Jul 12, 2022
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -203,11 +203,13 @@ jobs:
       - name: Run cargo-tarpaulin
         uses: actions-rs/tarpaulin@v0.1
         with:
+          version: '0.20.1'
           # Force cleaning via `--force-clean` flag to prevent buggy code coverage
           args: >-
             --manifest-path ${{ env.cargo_manifest }}
             --locked
             --force-clean
+            -- --test-threads=1
         env:
           # Ensure debug output is also tested
           RUST_LOG: debug

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - GraphQL replication service gets and verifies new entries and inserts them into the db [#137](https://github.com/p2panda/aquadoggo/pull/137)
+- `validation` and `domain` modules used for publish and next args API [#204](https://github.com/p2panda/aquadoggo/pull/204)
 - Add schema task and schema provider that update when new schema views are materialised [#166](https://github.com/p2panda/aquadoggo/pull/166)
 
 ### Changed

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aquadoggo/Cargo.toml b/aquadoggo/Cargo.toml
@@ -31,7 +31,7 @@ gql_client = "^1.0.6"
 lipmaa-link = "^0.2.2"
 log = "^0.4.17"
 openssl-probe = "^0.1.5"
-p2panda-rs = { git = "https://github.com/p2panda/p2panda", rev = "e06fd08c45253d60fcd42778f59e946a9ed73f71" }
+p2panda-rs = { git = "https://github.com/p2panda/p2panda", rev = "5d6508d5a9b4b766621c3bd14879cc568fbac02d" }
 serde = { version = "^1.0.137", features = ["derive"] }
 sqlx = { version = "^0.6.0", features = [
     "any",
@@ -61,7 +61,7 @@ hex = "0.4.3"
 http = "^0.2.8"
 hyper = "^0.14.19"
 once_cell = "^1.12.0"
-p2panda-rs = { git = "https://github.com/p2panda/p2panda", rev = "e06fd08c45253d60fcd42778f59e946a9ed73f71", features = [
+p2panda-rs = { git = "https://github.com/p2panda/p2panda", rev = "5d6508d5a9b4b766621c3bd14879cc568fbac02d", features = [
     "testing",
 ] }
 rand = "^0.8.5"

diff --git a/aquadoggo/src/db/mod.rs b/aquadoggo/src/db/mod.rs
@@ -8,7 +8,6 @@ use sqlx::migrate::MigrateDatabase;
 pub mod errors;
 pub mod models;
 pub mod provider;
-pub mod request;
 pub mod stores;
 pub mod traits;
 pub mod utils;

diff --git a/aquadoggo/src/db/provider.rs b/aquadoggo/src/db/provider.rs
@@ -7,13 +7,14 @@ use p2panda_rs::operation::VerifiedOperation;
 use p2panda_rs::schema::SchemaId;
 use p2panda_rs::storage_provider::errors::OperationStorageError;
 use p2panda_rs::storage_provider::traits::StorageProvider;
+use p2panda_rs::test_utils::db::{
+    EntryArgsRequest, EntryArgsResponse, PublishEntryRequest, PublishEntryResponse,
+};
 use sqlx::query_scalar;
 
-use crate::db::request::{EntryArgsRequest, PublishEntryRequest};
 use crate::db::stores::{StorageEntry, StorageLog};
 use crate::db::Pool;
-use crate::errors::StorageProviderResult;
-use crate::graphql::client::NextEntryArguments;
+use crate::errors::Result;
 
 /// Sql based storage that implements `StorageProvider`.
 #[derive(Clone, Debug)]
@@ -31,21 +32,21 @@ impl SqlStorage {
 /// A `StorageProvider` implementation based on `sqlx` that supports SQLite and PostgreSQL
 /// databases.
 #[async_trait]
-impl StorageProvider<StorageEntry, StorageLog, VerifiedOperation> for SqlStorage {
-    type EntryArgsResponse = NextEntryArguments;
+impl StorageProvider for SqlStorage {
     type EntryArgsRequest = EntryArgsRequest;
-    type PublishEntryResponse = NextEntryArguments;
+    type EntryArgsResponse = EntryArgsResponse;
     type PublishEntryRequest = PublishEntryRequest;
+    type PublishEntryResponse = PublishEntryResponse;
+    type StorageLog = StorageLog;
+    type StorageEntry = StorageEntry;
+    type StorageOperation = VerifiedOperation;
 
     /// Returns the related document for any entry.
     ///
     /// Every entry is part of a document and, through that, associated with a specific log id used
     /// by this document and author. This method returns that document id by looking up the log
     /// that the entry was stored in.
-    async fn get_document_by_entry(
-        &self,
-        entry_hash: &Hash,
-    ) -> StorageProviderResult<Option<DocumentId>> {
+    async fn get_document_by_entry(&self, entry_hash: &Hash) -> Result<Option<DocumentId>> {
         let result: Option<String> = query_scalar(
             "
             SELECT
@@ -81,7 +82,7 @@ impl SqlStorage {
     pub async fn get_schema_by_document_view(
         &self,
         view_id: &DocumentViewId,
-    ) -> StorageProviderResult<Option<SchemaId>> {
+    ) -> Result<Option<SchemaId>> {
         let result: Option<String> = query_scalar(
             "
             SELECT
@@ -92,7 +93,7 @@ impl SqlStorage {
                 document_view_id = $1
             ",
         )
-        .bind(view_id.as_str())
+        .bind(view_id.to_string())
         .fetch_optional(&self.pool)
         .await
         .map_err(|e| OperationStorageError::FatalStorageError(e.to_string()))?;
@@ -120,8 +121,10 @@ mod tests {
     use crate::db::stores::test_utils::{test_db, TestDatabase, TestDatabaseRunner};
     use crate::db::traits::DocumentStore;
 
+    use super::SqlStorage;
+
     /// Inserts a `DocumentView` into the db and returns its view id.
-    async fn insert_document_view(db: &TestDatabase) -> DocumentViewId {
+    async fn insert_document_view(db: &TestDatabase<SqlStorage>) -> DocumentViewId {
         let author = Author::try_from(db.test_data.key_pairs[0].public_key().to_owned()).unwrap();
         let entry = db
             .store
@@ -153,7 +156,7 @@ mod tests {
         #[with(1, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_view_id = insert_document_view(&db).await;
             let result = db
                 .store
@@ -172,7 +175,7 @@ mod tests {
         #[with(1, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let result = db
                 .store
                 .get_schema_by_document_view(&random_document_view_id)

diff --git a/aquadoggo/src/db/request.rs b/aquadoggo/src/db/request.rs
diff --git a/aquadoggo/src/db/stores/document.rs b/aquadoggo/src/db/stores/document.rs
@@ -51,7 +51,7 @@ impl DocumentStore for SqlStorage {
                             ($1, $2, $3)
                         ",
                 )
-                .bind(document_view.id().as_str())
+                .bind(document_view.id().to_string())
                 .bind(value.id().as_str().to_owned())
                 .bind(name)
                 .execute(&self.pool)
@@ -71,8 +71,8 @@ impl DocumentStore for SqlStorage {
                 ($1, $2)
             ",
         )
-        .bind(document_view.id().as_str())
-        .bind(schema_id.as_str())
+        .bind(document_view.id().to_string())
+        .bind(schema_id.to_string())
         .execute(&self.pool)
         .await
         .map_err(|e| DocumentStorageError::FatalStorageError(e.to_string()))?;
@@ -129,7 +129,7 @@ impl DocumentStore for SqlStorage {
                 operation_fields_v1.list_index ASC
             ",
         )
-        .bind(id.as_str())
+        .bind(id.to_string())
         .fetch_all(&self.pool)
         .await
         .map_err(|e| DocumentStorageError::FatalStorageError(e.to_string()))?;
@@ -173,9 +173,9 @@ impl DocumentStore for SqlStorage {
             ",
         )
         .bind(document.id().as_str())
-        .bind(document.view_id().as_str())
+        .bind(document.view_id().to_string())
         .bind(document.is_deleted())
-        .bind(document.schema().as_str())
+        .bind(document.schema().to_string())
         .execute(&self.pool)
         .await
         .map_err(|e| DocumentStorageError::FatalStorageError(e.to_string()))?;
@@ -283,7 +283,7 @@ impl DocumentStore for SqlStorage {
                 operation_fields_v1.list_index ASC
             ",
         )
-        .bind(schema_id.as_str())
+        .bind(schema_id.to_string())
         .fetch_all(&self.pool)
         .await
         .map_err(|e| DocumentStorageError::FatalStorageError(e.to_string()))?;
@@ -333,6 +333,7 @@ mod tests {
     };
     use rstest::rstest;
 
+    use crate::db::provider::SqlStorage;
     use crate::db::stores::document::{DocumentStore, DocumentView};
     use crate::db::stores::entry::StorageEntry;
     use crate::db::stores::test_utils::{test_db, TestDatabase, TestDatabaseRunner};
@@ -373,7 +374,7 @@ mod tests {
         #[with(1, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let author =
                 Author::try_from(db.test_data.key_pairs[0].public_key().to_owned()).unwrap();
 
@@ -435,7 +436,7 @@ mod tests {
         #[with(1, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let view_does_not_exist = db
                 .store
                 .get_document_view_by_id(&random_document_view_id)
@@ -452,7 +453,7 @@ mod tests {
         #[with(10, 1, 1, false, SCHEMA_ID.parse().unwrap(), vec![("username", OperationValue::Text("panda".into()))], vec![("username", OperationValue::Text("PANDA".into()))])]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let author =
                 Author::try_from(db.test_data.key_pairs[0].public_key().to_owned()).unwrap();
             let schema_id = SchemaId::from_str(SCHEMA_ID).unwrap();
@@ -510,7 +511,7 @@ mod tests {
         #[from(test_db)] runner: TestDatabaseRunner,
         operation: Operation,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_view = DocumentView::new(
                 &document_view_id,
                 &DocumentViewFields::new_from_operation_fields(
@@ -534,7 +535,7 @@ mod tests {
         #[with(1, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_id = db.test_data.documents[0].clone();
 
             let document_operations = db
@@ -581,7 +582,7 @@ mod tests {
         #[with(1, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_id = db.test_data.documents[0].clone();
 
             let document_operations = db
@@ -628,7 +629,7 @@ mod tests {
         #[with(10, 1, 1, true)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_id = db.test_data.documents[0].clone();
 
             let document_operations = db
@@ -655,7 +656,7 @@ mod tests {
         #[with(10, 1, 1, true)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_id = db.test_data.documents[0].clone();
 
             let document_operations = db
@@ -686,7 +687,7 @@ mod tests {
         #[with(10, 1, 1)]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let document_id = db.test_data.documents[0].clone();
 
             let document_operations = db
@@ -721,7 +722,7 @@ mod tests {
         #[with(10, 2, 1, false, SCHEMA_ID.parse().unwrap())]
         runner: TestDatabaseRunner,
     ) {
-        runner.with_db_teardown(|db: TestDatabase| async move {
+        runner.with_db_teardown(|db: TestDatabase<SqlStorage>| async move {
             let schema_id = SchemaId::from_str(SCHEMA_ID).unwrap();
 
             for document_id in &db.test_data.documents {