From 42e59a139e2b4068cfc58f2215307a77c7254088 Mon Sep 17 00:00:00 2001 From: Brooklyn Zelenka Date: Mon, 25 Mar 2024 19:59:57 -0700 Subject: [PATCH] Remove unused imports --- src/ability/crud/update.rs | 2 +- src/ability/msg.rs | 3 --- src/ability/ucan/assert.rs | 2 +- src/ability/ucan/revoke.rs | 1 - src/delegation/payload.rs | 6 ++--- src/delegation/policy/predicate.rs | 2 +- src/delegation/policy/selector.rs | 11 +-------- src/delegation/policy/selector/filter.rs | 6 ++--- src/delegation/policy/selector/select.rs | 3 +-- src/delegation/store/memory.rs | 4 +-- src/did/key/signer.rs | 8 ------ src/did/preset.rs | 2 +- src/did/traits.rs | 1 - src/invocation/agent.rs | 4 +-- src/invocation/payload.rs | 31 +++++++++++------------- src/invocation/promise/store/memory.rs | 1 - src/invocation/promise/store/traits.rs | 1 - src/ipld/cid.rs | 2 +- src/ipld/newtype.rs | 1 - src/ipld/number.rs | 2 +- src/ipld/promised.rs | 2 +- 21 files changed, 31 insertions(+), 64 deletions(-) diff --git a/src/ability/crud/update.rs b/src/ability/crud/update.rs index 935ab40f..b0f7a6bb 100644 --- a/src/ability/crud/update.rs +++ b/src/ability/crud/update.rs @@ -7,7 +7,7 @@ use crate::{ }; use libipld_core::ipld::Ipld; use serde::{Deserialize, Serialize}; -use std::{collections::BTreeMap, path::PathBuf}; +use std::path::PathBuf; use thiserror::Error; #[cfg_attr(doc, aquamarine::aquamarine)] diff --git a/src/ability/msg.rs b/src/ability/msg.rs index 9fd9230e..0e7e35d1 100644 --- a/src/ability/msg.rs +++ b/src/ability/msg.rs @@ -17,9 +17,6 @@ use receive::{PromisedReceive, Receive}; use send::{PromisedSend, Send}; use serde::{Deserialize, Serialize}; -#[cfg(feature = "test_utils")] -use proptest::prelude::*; - #[cfg(feature = "test_utils")] use proptest_derive::Arbitrary; diff --git a/src/ability/ucan/assert.rs b/src/ability/ucan/assert.rs index 62946c23..410d0148 100644 --- a/src/ability/ucan/assert.rs +++ b/src/ability/ucan/assert.rs @@ -1,6 +1,6 @@ use crate::ability::command::Command; use crate::task::Task; -use libipld_core::{cid::Cid, ipld::Ipld}; +use libipld_core::cid::Cid; // Things that you can assert include content and receipts diff --git a/src/ability/ucan/revoke.rs b/src/ability/ucan/revoke.rs index b7ee1313..37c4f051 100644 --- a/src/ability/ucan/revoke.rs +++ b/src/ability/ucan/revoke.rs @@ -9,7 +9,6 @@ use crate::{ }; use libipld_core::{cid::Cid, ipld::Ipld}; use serde::{Deserialize, Serialize}; -use std::collections::BTreeMap; use std::fmt::Debug; /// The fully resolved variant: ready to execute. diff --git a/src/delegation/payload.rs b/src/delegation/payload.rs index c54438ec..32a493c7 100644 --- a/src/delegation/payload.rs +++ b/src/delegation/payload.rs @@ -3,15 +3,13 @@ use crate::ability::arguments::Named; use crate::time; use crate::{ capsule::Capsule, - crypto::{varsig, Nonce}, + crypto::Nonce, did::{Did, Verifiable}, time::{TimeBoundError, Timestamp}, }; use core::str::FromStr; use derive_builder::Builder; -use did_url::DID; -use libipld_core::{codec::Codec, error::SerdeError, ipld::Ipld, serde as ipld_serde}; -use serde::{Deserialize, Serialize}; +use libipld_core::ipld::Ipld; use std::{collections::BTreeMap, fmt::Debug}; use thiserror::Error; use web_time::SystemTime; diff --git a/src/delegation/policy/predicate.rs b/src/delegation/policy/predicate.rs index 30c9c0dd..18ee1b98 100644 --- a/src/delegation/policy/predicate.rs +++ b/src/delegation/policy/predicate.rs @@ -3,7 +3,7 @@ use super::selector::{Select, SelectorError}; use crate::ipld; use enum_as_inner::EnumAsInner; use libipld_core::ipld::Ipld; -use std::{fmt, str::FromStr}; +use std::str::FromStr; use thiserror::Error; #[cfg(feature = "test_utils")] diff --git a/src/delegation/policy/selector.rs b/src/delegation/policy/selector.rs index acba9a2c..f33cc7f3 100644 --- a/src/delegation/policy/selector.rs +++ b/src/delegation/policy/selector.rs @@ -9,16 +9,7 @@ pub use select::Select; pub use selectable::Selectable; use filter::Filter; -use nom::{ - self, - bytes::complete::tag, - character::complete::char, - combinator::map_res, - error::context, - multi::{many0, many1}, - sequence::preceded, - IResult, -}; +use nom::{self, character::complete::char, multi::many0, sequence::preceded}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use std::cmp::Ordering; use std::{fmt, str::FromStr}; diff --git a/src/delegation/policy/selector/filter.rs b/src/delegation/policy/selector/filter.rs index 96343a5a..a9d089d2 100644 --- a/src/delegation/policy/selector/filter.rs +++ b/src/delegation/policy/selector/filter.rs @@ -4,8 +4,8 @@ use nom::{ self, branch::alt, bytes::complete::tag, - character::complete::{alphanumeric1, anychar, char, digit1}, - combinator::{map_opt, map_res}, + character::complete::{alphanumeric1, char, digit1}, + combinator::map_res, error::context, multi::many1, sequence::{delimited, preceded, terminated}, @@ -33,7 +33,7 @@ impl Filter { (Filter::Values, Filter::Values) => true, (Filter::ArrayIndex(_a), Filter::Values) => true, (Filter::Field(_k), Filter::Values) => true, - (Filter::Try(a), Filter::Try(b)) => a.is_in(b), // FIXME Try is basically == null? + (Filter::Try(a), Filter::Try(b)) => a.is_in(b), _ => false, } } diff --git a/src/delegation/policy/selector/select.rs b/src/delegation/policy/selector/select.rs index 7506cc63..67f3eaa9 100644 --- a/src/delegation/policy/selector/select.rs +++ b/src/delegation/policy/selector/select.rs @@ -1,7 +1,6 @@ -use super::Selector; // FIXME cycle? +use super::Selector; use super::{error::SelectorErrorReason, filter::Filter, Selectable, SelectorError}; use libipld_core::ipld::Ipld; -use serde::{Deserialize, Serialize}; use std::cmp::Ordering; use std::fmt; use std::str::FromStr; diff --git a/src/delegation/store/memory.rs b/src/delegation/store/memory.rs index bdc7e6e7..2622ef06 100644 --- a/src/delegation/store/memory.rs +++ b/src/delegation/store/memory.rs @@ -10,7 +10,7 @@ use libipld_core::codec::Encode; use libipld_core::ipld::Ipld; use libipld_core::{cid::Cid, codec::Codec}; use nonempty::NonEmpty; -use std::sync::{Arc, Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard}; +use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard}; use std::{ collections::{BTreeMap, BTreeSet}, convert::Infallible, @@ -203,7 +203,7 @@ where aud: &DID, subject: &DID, command: String, - policy: Vec, + _policy: Vec, // FIXME now: SystemTime, ) -> Result>)>>, Self::DelegationStoreError> { diff --git a/src/did/key/signer.rs b/src/did/key/signer.rs index b7f95e40..7d69fa94 100644 --- a/src/did/key/signer.rs +++ b/src/did/key/signer.rs @@ -22,9 +22,6 @@ use crate::crypto::rs256; #[cfg(feature = "rs512")] use crate::crypto::rs512; -#[cfg(feature = "bls")] -use crate::crypto::bls12381; - /// Signer types that are verifiable by `did:key` [`Verifier`]s. #[derive(Clone, EnumAsInner)] pub enum Signer { @@ -63,11 +60,6 @@ pub enum Signer { /// `BLS 12-381` signer for the "min sig" variant. #[cfg(feature = "bls")] BlsMinSig(blst::min_sig::SecretKey), - // /// An unknown signer type. - // /// - // /// This is primarily for parsing, where reification is delayed - // /// until the DID method is known. - // FIXME rmeove Unknown(Vec), } impl signature::Signer for Signer { diff --git a/src/did/preset.rs b/src/did/preset.rs index a4616525..ff34c699 100644 --- a/src/did/preset.rs +++ b/src/did/preset.rs @@ -54,7 +54,7 @@ pub enum Signer { impl std::fmt::Debug for Signer { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - Signer::Key(signer) => write!(f, "Signer::Key(HIDDEN)"), + Signer::Key(_signer) => write!(f, "Signer::Key(HIDDEN)"), } } } diff --git a/src/did/traits.rs b/src/did/traits.rs index 76e9220f..8e55df2d 100644 --- a/src/did/traits.rs +++ b/src/did/traits.rs @@ -1,4 +1,3 @@ -use did_url::DID; use std::fmt; use std::str::FromStr; diff --git a/src/invocation/agent.rs b/src/invocation/agent.rs index 3929e728..cae4ad1d 100644 --- a/src/invocation/agent.rs +++ b/src/invocation/agent.rs @@ -6,10 +6,8 @@ use super::{ use crate::ability::arguments::Named; use crate::ability::command::ToCommand; use crate::ability::parse::ParseAbility; -use crate::delegation::Delegation; -use crate::invocation::payload::PayloadBuilder; use crate::{ - ability::{self, arguments, parse::ParseAbilityError, ucan::revoke::Revoke}, + ability::{self, arguments}, crypto::{ signature::{self, Envelope}, varsig, Nonce, diff --git a/src/invocation/payload.rs b/src/invocation/payload.rs index 6e92ae64..a1cfab06 100644 --- a/src/invocation/payload.rs +++ b/src/invocation/payload.rs @@ -1,13 +1,10 @@ use super::promise::Resolvable; -use crate::ability::command::Command; use crate::ability::parse::ParseAbilityError; -use crate::delegation::policy::selector; -use crate::invocation::Named; use crate::time; use crate::{ - ability::{arguments, command::ToCommand, parse::ParseAbility}, + ability::{arguments::Named, command::ToCommand, parse::ParseAbility}, capsule::Capsule, - crypto::{varsig, Nonce}, + crypto::Nonce, delegation::{ self, policy::{selector::SelectorError, Predicate}, @@ -16,7 +13,7 @@ use crate::{ time::{Expired, Timestamp}, }; use derive_builder::Builder; -use libipld_core::{cid::Cid, codec::Codec, ipld::Ipld}; +use libipld_core::{cid::Cid, ipld::Ipld}; use serde::{ de::{self, MapAccess, Visitor}, ser::SerializeStruct, @@ -158,7 +155,7 @@ impl Payload { where A: ToCommand + Clone, DID: Clone, - arguments::Named: From, + Named: From, { let now_ts = Timestamp::postel(now); @@ -168,7 +165,7 @@ impl Payload { } } - let args: arguments::Named = self.ability.clone().into(); + let args: Named = self.ability.clone().into(); let mut cmd = self.ability.to_command(); if !cmd.ends_with('/') { @@ -272,17 +269,17 @@ impl Capsule for Payload { const TAG: &'static str = "ucan/i@1.0.0-rc.1"; } -impl From> for arguments::Named +impl From> for Named where - arguments::Named: From, + Named: From, { fn from(payload: Payload) -> Self { - let mut args = arguments::Named::from_iter([ + let mut args = Named::from_iter([ ("iss".into(), { payload.issuer.to_string().into() }), ("sub".into(), { payload.subject.to_string().into() }), ("cmd".into(), { payload.ability.to_command().into() }), ("args".into(), { - Ipld::Map(arguments::Named::::from(payload.ability).0) + Ipld::Map(Named::::from(payload.ability).0) }), ("prf".into(), { Ipld::List(payload.proofs.iter().map(Into::into).collect()) @@ -316,10 +313,10 @@ where impl From> for Ipld where - arguments::Named: From>, + Named: From>, { fn from(payload: Payload) -> Self { - arguments::Named::from(payload).into() + Named::from(payload).into() } } @@ -514,14 +511,14 @@ impl Verifiable for Payload { } } -impl TryFrom> for Payload +impl TryFrom> for Payload where ::ArgsErr: fmt::Debug, ::Err: fmt::Debug, { type Error = ParseError; - fn try_from(named: arguments::Named) -> Result { + fn try_from(named: Named) -> Result { let mut subject = None; let mut issuer = None; let mut audience = None; @@ -828,7 +825,7 @@ mod tests { } #[test_log::test] - fn test_non_payload(named in arguments::Named::::arbitrary()) { + fn test_non_payload(named in Named::::arbitrary()) { // Just ensuring that a negative test shows up let parsed = Payload::::try_from(named); prop_assert!(parsed.is_err()) diff --git a/src/invocation/promise/store/memory.rs b/src/invocation/promise/store/memory.rs index 6f587f7a..afc5653b 100644 --- a/src/invocation/promise/store/memory.rs +++ b/src/invocation/promise/store/memory.rs @@ -1,5 +1,4 @@ use super::Store; -use crate::{did::Did, invocation::promise::Resolvable}; use libipld_core::cid::Cid; use std::{ collections::{BTreeMap, BTreeSet}, diff --git a/src/invocation/promise/store/traits.rs b/src/invocation/promise/store/traits.rs index 0e894c84..35568ab3 100644 --- a/src/invocation/promise/store/traits.rs +++ b/src/invocation/promise/store/traits.rs @@ -1,4 +1,3 @@ -use crate::{did::Did, invocation::promise::Resolvable}; use libipld_core::cid::Cid; use std::collections::BTreeSet; diff --git a/src/ipld/cid.rs b/src/ipld/cid.rs index 5715b5c8..f812b2f6 100644 --- a/src/ipld/cid.rs +++ b/src/ipld/cid.rs @@ -1,7 +1,7 @@ //! Utilities for [`Cid`]s use crate::ipld; -use libipld_core::{cid::Cid, ipld::Ipld, multihash::MultihashGeneric}; +use libipld_core::{cid::Cid, ipld::Ipld}; use serde::{Deserialize, Serialize}; use thiserror::Error; diff --git a/src/ipld/newtype.rs b/src/ipld/newtype.rs index 31451de1..7e898ed2 100644 --- a/src/ipld/newtype.rs +++ b/src/ipld/newtype.rs @@ -1,6 +1,5 @@ use libipld_core::ipld::Ipld; use serde::{Deserialize, Serialize}; -use std::fmt; use std::path::PathBuf; use thiserror::Error; diff --git a/src/ipld/number.rs b/src/ipld/number.rs index e7c3c611..25cbaae3 100644 --- a/src/ipld/number.rs +++ b/src/ipld/number.rs @@ -1,7 +1,7 @@ //! Helpers for working with [`Ipld`] numerics. use enum_as_inner::EnumAsInner; -use libipld_core::{error::SerdeError, ipld::Ipld, serde as ipld_serde}; +use libipld_core::ipld::Ipld; use serde_derive::{Deserialize, Serialize}; use thiserror::Error; diff --git a/src/ipld/promised.rs b/src/ipld/promised.rs index 0416fde2..5e336148 100644 --- a/src/ipld/promised.rs +++ b/src/ipld/promised.rs @@ -1,7 +1,7 @@ use crate::{ ability::arguments, invocation::promise::{self, Pending, PromiseErr, PromiseOk}, - ipld, url, + url, }; use enum_as_inner::EnumAsInner; use libipld_core::{cid::Cid, ipld::Ipld};