remove indy-wql crate

Signed-off-by: Andrew Whitehead <[email protected]>

Cargo.toml

@@ -4,10 +4,10 @@ members = [
     "indy-credx",
     "indy-data-types",
     "indy-test-utils",
-    "indy-utils",
-    "indy-wql"
+    "indy-utils"
 ]
 
 [profile.release]
+panic = "abort"
 lto = true
 codegen-units = 1

indy-credx/Cargo.toml

@@ -44,4 +44,3 @@ features = ["cl_native"]
 version = "0.5"
 path = "../indy-utils"
 default-features = false
-features = ["wql"]

indy-credx/src/services/verifier.rs

@@ -11,8 +11,8 @@ use indy_data_types::anoncreds::{
     nonce::Nonce,
     pres_request::{AttributeInfo, NonRevocedInterval, PredicateInfo, PresentationRequestPayload},
     presentation::{Identifier, RequestedProof, RevealedAttributeInfo},
+    wql::Query,
 };
-use indy_utils::wql::Query;
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct Filter {

indy-data-types/Cargo.toml

@@ -32,15 +32,15 @@ once_cell = "1.9"
 regex = "1.3"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 serde_json = { version = "1.0", optional = true, features = ["raw_value"] }
-ursa = { version = "=0.3.6", default-features = false, optional = true }
+ursa = { version = "0.3.7", default-features = false, optional = true }
 zeroize = { version = "1.1", features = ["zeroize_derive"] }
 
 [dependencies.indy-utils]
 version = "0.5"
 path = "../indy-utils"
 default-features = false
-features = ["wql"]
 
 [dev-dependencies]
 hex = "0.4"
+rand = "0.8"
 serde_json = "1.0"

indy-data-types/src/anoncreds/mod.rs

@@ -38,3 +38,5 @@ pub mod rich_schema;
 
 /// V1 credential schemas
 pub mod schema;
+
+pub mod wql;

indy-data-types/src/anoncreds/pres_request.rs

@@ -8,14 +8,14 @@ use serde_json::Value;
 
 use super::credential::Credential;
 use super::nonce::Nonce;
+use super::wql::Query;
+use crate::did::DidValue;
 use crate::identifiers::cred_def::CredentialDefinitionId;
 use crate::identifiers::rev_reg::RevocationRegistryId;
 use crate::identifiers::schema::SchemaId;
+use crate::invalid;
 use crate::utils::{qualifiable, Qualifiable};
 use crate::{Validatable, ValidationError};
-use indy_utils::did::DidValue;
-use indy_utils::invalid;
-use indy_utils::wql::Query;
 
 #[derive(Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]

indy-wql/src/lib.rs → indy-data-types/src/anoncreds/wql.rs

@@ -1,7 +1,5 @@
 //! Indy WQL (wallet query language) parsing and optimization
 
-#![deny(missing_debug_implementations, missing_docs, rust_2018_idioms)]
-
 /// An abstract query representation over a key and value type
 #[derive(Debug, Hash, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum AbstractQuery<K, V> {

indy-utils/Cargo.toml

@@ -16,20 +16,18 @@ path = "src/lib.rs"
 crate-type = ["rlib"]
 
 [features]
-default = ["ed25519", "hash", "txn_signature", "wql"]
+default = ["ed25519", "hash", "txn_signature"]
 base64 = ["base64_rs"]
 ed25519 = ["curve25519-dalek", "ed25519-dalek", "rand", "sha2", "x25519-dalek"]
 hash = ["sha2"]
 txn_signature = ["hex", "sha2", "serde", "serde_json"]
-wql = ["indy-wql", "serde", "serde_json"]
 
 [dependencies]
 base64_rs = { package = "base64", version = "0.13", optional = true }
 bs58 = "0.4"
 curve25519-dalek = { version = "3.1", default-features = false, features = ["u64_backend"], optional = true }
 ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"], optional = true }
 hex = { version = "0.4", optional = true }
-indy-wql = { version = "0.4", optional = true, path = "../indy-wql" }
 once_cell = "1.9"
 rand = { version = "0.8", optional = true }
 regex = "1.3"

indy-utils/src/lib.rs

@@ -39,7 +39,3 @@ pub mod hash;
 /// Generation of normalized ledger transaction for signing
 #[cfg(feature = "txn_signature")]
 pub mod txn_signature;
-
-/// Wallet query language
-#[cfg(feature = "wql")]
-pub use indy_wql as wql;