34: replace url crate with peg parser based on RFC 3986

.vscode/launch.json

@@ -0,0 +1,44 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'didethresolver'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                ],
+                "filter": {
+                    "name": "lib-didethresolver",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug executable 'resolver'",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=resolver",
+                    "--package=resolver"
+                ],
+                "filter": {
+                    "name": "resolver",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+    ]
+}

lib/Cargo.toml

@@ -38,7 +38,6 @@ smart-default = "0.7"
 sha3 = "0.10"
 peg = "0.8"
 rustc-hex = "2.1"
-tiny-keccak = { version = "2.0.2", default-features = false }
 
 [dev-dependencies]
 tracing-subscriber.workspace = true 

lib/src/error.rs

@@ -23,8 +23,6 @@ pub enum ResolverError<M: Middleware> {
 pub enum DidError {
     #[error("Parsing of ethr:did failed, {0}")]
     Parse(#[from] peg::error::ParseError<peg::str::LineCol>),
-    #[error(transparent)]
-    Url(#[from] url::ParseError),
 }
 
 /// Errors originating during the construction of a ethr:did document [`EthrBuilder`](crate::types::EthrBuilder)

lib/src/resolver.rs

@@ -128,7 +128,7 @@ impl<M: Middleware + 'static> Resolver<M> {
         history: Vec<(DIDRegistryEvents, LogMeta)>,
     ) -> Result<DidResolutionResult, ResolverError<M>> {
         let mut base_document = DidDocument::ethr_builder();
-        base_document.public_key(&public_key)?;
+        base_document.account_address(&public_key)?;
 
         let current_block = self
             .signer

lib/src/resolver/did_registry.rs

@@ -8,8 +8,8 @@ use ethers::{
     providers::Middleware,
     signers::{LocalWallet, Signer},
     types::{Signature, H256, U256, U64},
+    utils::keccak256,
 };
-use tiny_keccak::{Hasher, Keccak};
 
 pub use self::did_registry::*;
 
@@ -228,19 +228,6 @@ async fn sign_typed_data<M: Middleware>(
     Ok(signature)
 }
 
-/// Compute the Keccak-256 hash of input bytes.
-///
-/// Note that strings are interpreted as UTF-8 bytes,
-pub fn keccak256<T: AsRef<[u8]>>(bytes: T) -> [u8; 32] {
-    let mut output = [0u8; 32];
-
-    let mut hasher = Keccak::v256();
-    hasher.update(bytes.as_ref());
-    hasher.finalize(&mut output);
-
-    output
-}
-
 #[cfg(test)]
 mod test {
     use super::*;