chore: re-remove BigUint and OID imports (#220)

* chore: re-remove `BigUint` and `OID` imports

But this time bump `simple_asn1` to the patch that forces this to work (older versions don't use the `$crate::` idiom which enable this to work).

* chore: cleanup imports

`cargo fmt -- --config imports_granularity="Crate"`

ic-agent/Cargo.toml

@@ -30,7 +30,7 @@ ring = { version = "0.16.11", features = ["std"] }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_bytes = "0.11.2"
 serde_cbor = "0.11.1"
-simple_asn1 = "0.5.0"
+simple_asn1 = "0.5.4"
 thiserror = "1.0.20"
 url = "2.1.0"
 webpki-roots = "0.20.0"

ic-agent/src/agent/agent_config.rs

@@ -1,6 +1,7 @@
-use crate::agent::{NonceFactory, ReplicaV2Transport};
-use crate::identity::anonymous::AnonymousIdentity;
-use crate::identity::Identity;
+use crate::{
+    agent::{NonceFactory, ReplicaV2Transport},
+    identity::{anonymous::AnonymousIdentity, Identity},
+};
 use std::sync::Arc;
 
 /// A configuration for an agent.

ic-agent/src/agent/agent_error.rs

@@ -1,9 +1,9 @@
-use crate::agent::status::Status;
-use crate::hash_tree::Label;
-use crate::RequestIdError;
+use crate::{agent::status::Status, hash_tree::Label, RequestIdError};
 use leb128::read;
-use std::fmt::{Debug, Display, Formatter};
-use std::str::Utf8Error;
+use std::{
+    fmt::{Debug, Display, Formatter},
+    str::Utf8Error,
+};
 use thiserror::Error;
 
 #[derive(Error, Debug)]

ic-agent/src/agent/agent_test.rs

@@ -1,10 +1,14 @@
 // Disable these tests without the reqwest feature.
 #![cfg(feature = "reqwest")]
 
-use crate::agent::replica_api::{CallReply, QueryResponse};
-use crate::agent::Status;
-use crate::export::Principal;
-use crate::{Agent, AgentError};
+use crate::{
+    agent::{
+        replica_api::{CallReply, QueryResponse},
+        Status,
+    },
+    export::Principal,
+    Agent, AgentError,
+};
 use mockito::mock;
 use std::collections::BTreeMap;
 

ic-agent/src/agent/builder.rs

@@ -1,5 +1,7 @@
-use crate::agent::{AgentConfig, ReplicaV2Transport};
-use crate::{Agent, AgentError, Identity, NonceFactory};
+use crate::{
+    agent::{AgentConfig, ReplicaV2Transport},
+    Agent, AgentError, Identity, NonceFactory,
+};
 use std::sync::Arc;
 
 pub struct AgentBuilder {

ic-agent/src/agent/http_transport.rs

@@ -1,13 +1,9 @@
 //! A [ReplicaV2Transport] that connects using a reqwest client.
 #![cfg(feature = "reqwest")]
 
-use crate::agent::agent_error::HttpErrorPayload;
-use crate::ic_types::Principal;
-use crate::AgentError;
-use crate::RequestId;
+use crate::{agent::agent_error::HttpErrorPayload, ic_types::Principal, AgentError, RequestId};
 use reqwest::Method;
-use std::future::Future;
-use std::pin::Pin;
+use std::{future::Future, pin::Pin};
 
 /// Implemented by the Agent environment to cache and update an HTTP Auth password.
 /// It returns a tuple of `(username, password)`.

ic-agent/src/agent/mod.rs

@@ -19,28 +19,34 @@ pub use response::{Replied, RequestStatusResponse};
 #[cfg(test)]
 mod agent_test;
 
-use crate::agent::replica_api::{
-    CallRequestContent, Certificate, Delegation, Envelope, QueryContent, ReadStateContent,
-    ReadStateResponse,
+use crate::{
+    agent::replica_api::{
+        CallRequestContent, Certificate, Delegation, Envelope, QueryContent, ReadStateContent,
+        ReadStateResponse,
+    },
+    export::Principal,
+    hash_tree::Label,
+    identity::Identity,
+    to_request_id, RequestId,
 };
-use crate::export::Principal;
-use crate::hash_tree::Label;
-use crate::identity::Identity;
-use crate::{to_request_id, RequestId};
 use garcon::Waiter;
 use serde::Serialize;
 use status::Status;
 
-use crate::agent::response_authentication::{
-    extract_der, initialize_bls, lookup_canister_info, lookup_request_status, lookup_value,
+use crate::{
+    agent::response_authentication::{
+        extract_der, initialize_bls, lookup_canister_info, lookup_request_status, lookup_value,
+    },
+    bls::bls12381::bls,
+};
+use std::{
+    convert::TryFrom,
+    future::Future,
+    pin::Pin,
+    sync::{Arc, RwLock},
+    task::{Context, Poll},
+    time::Duration,
 };
-use crate::bls::bls12381::bls;
-use std::convert::TryFrom;
-use std::future::Future;
-use std::pin::Pin;
-use std::sync::{Arc, RwLock};
-use std::task::{Context, Poll};
-use std::time::Duration;
 
 const IC_REQUEST_DOMAIN_SEPARATOR: &[u8; 11] = b"\x0Aic-request";
 const IC_STATE_ROOT_DOMAIN_SEPARATOR: &[u8; 14] = b"\x0Dic-state-root";

ic-agent/src/agent/nonce.rs

@@ -1,5 +1,4 @@
-use rand::rngs::OsRng;
-use rand::Rng;
+use rand::{rngs::OsRng, Rng};
 use std::sync::{Arc, Mutex};
 
 /// A Factory for nonce blobs.

ic-agent/src/agent/replica_api.rs

@@ -1,5 +1,7 @@
-use crate::export::Principal;
-use crate::hash_tree::{HashTree, Label};
+use crate::{
+    export::Principal,
+    hash_tree::{HashTree, Label},
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

ic-agent/src/agent/response_authentication.rs

@@ -1,11 +1,11 @@
 use crate::{ic_types::Principal, AgentError, RequestId};
 
-use crate::agent::replica_api::Certificate;
-use crate::agent::{Replied, RequestStatusResponse};
-use crate::bls::bls12381::bls;
-use crate::hash_tree::{Label, LookupResult};
-use std::str::from_utf8;
-use std::sync::Once;
+use crate::{
+    agent::{replica_api::Certificate, Replied, RequestStatusResponse},
+    bls::bls12381::bls,
+    hash_tree::{Label, LookupResult},
+};
+use std::{str::from_utf8, sync::Once};
 
 const DER_PREFIX: &[u8; 37] = b"\x30\x81\x82\x30\x1d\x06\x0d\x2b\x06\x01\x04\x01\x82\xdc\x7c\x05\x03\x01\x02\x01\x06\x0c\x2b\x06\x01\x04\x01\x82\xdc\x7c\x05\x03\x02\x01\x03\x61\x00";
 const KEY_LENGTH: usize = 96;

ic-agent/src/agent/signed.rs

@@ -1,5 +1,4 @@
-use crate::export::Principal;
-use crate::RequestId;
+use crate::{export::Principal, RequestId};
 
 use serde::{Deserialize, Serialize};
 

ic-agent/src/agent/status.rs

@@ -1,5 +1,4 @@
-use std::collections::BTreeMap;
-use std::fmt::Debug;
+use std::{collections::BTreeMap, fmt::Debug};
 
 /// Value returned by the status endpoint of a replica. This is a loose mapping to CBOR values.
 /// Because the agent should not return [`serde_cbor::Value`] directly across API boundaries,

ic-agent/src/bls/bls12381/big.rs

@@ -17,13 +17,11 @@
  * limitations under the License.
  */
 
-use crate::bls::arch;
-use crate::bls::arch::Chunk;
+use crate::bls::{arch, arch::Chunk};
 
 use crate::bls::arch::DChunk;
 
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::rand::RAND;
+use crate::bls::{bls12381::dbig::DBIG, rand::RAND};
 
 pub const MODBYTES: usize = 48;
 pub const BASEBITS: usize = 58;

ic-agent/src/bls/bls12381/bls.rs

@@ -16,17 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::bls12381::ecp;
-use crate::bls::bls12381::ecp::ECP;
-use crate::bls::bls12381::ecp2::ECP2;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::fp4::FP4;
-use crate::bls::bls12381::pair;
-use crate::bls::bls12381::rom;
-use crate::bls::hmac;
+use crate::bls::{
+    bls12381::{big, big::BIG, dbig::DBIG, ecp, ecp::ECP, ecp2::ECP2, fp::FP, fp4::FP4, pair, rom},
+    hmac,
+};
 
 /* Boneh-Lynn-Shacham signature 128-bit API Functions */
 

ic-agent/src/bls/bls12381/dbig.rs

@@ -17,10 +17,11 @@
  * limitations under the License.
  */
 
-use crate::bls::arch;
-use crate::bls::arch::Chunk;
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
+use crate::bls::{
+    arch,
+    arch::Chunk,
+    bls12381::{big, big::BIG},
+};
 
 pub struct DBIG {
     pub w: [Chunk; big::DNLEN],

ic-agent/src/bls/bls12381/ecp.rs

@@ -17,12 +17,7 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::bls12381::fp;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::rom;
+use crate::bls::bls12381::{big, big::BIG, dbig::DBIG, fp, fp::FP, rom};
 
 #[derive(Clone)]
 pub struct ECP {

ic-agent/src/bls/bls12381/ecp2.rs

@@ -17,14 +17,7 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::bls12381::ecp;
-use crate::bls::bls12381::fp;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::fp2::FP2;
-use crate::bls::bls12381::rom;
+use crate::bls::bls12381::{big, big::BIG, dbig::DBIG, ecp, fp, fp::FP, fp2::FP2, rom};
 
 #[derive(Clone)]
 pub struct ECP2 {

ic-agent/src/bls/bls12381/fp.rs

@@ -17,12 +17,11 @@
  * limitations under the License.
  */
 
-use crate::bls::arch;
-use crate::bls::arch::Chunk;
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::bls12381::rom;
+use crate::bls::{
+    arch,
+    arch::Chunk,
+    bls12381::{big, big::BIG, dbig::DBIG, rom},
+};
 
 use crate::bls::rand::RAND;
 

ic-agent/src/bls/bls12381/fp12.rs

@@ -17,13 +17,7 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::ecp;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::fp2::FP2;
-use crate::bls::bls12381::fp4::FP4;
-use crate::bls::bls12381::rom;
+use crate::bls::bls12381::{big, big::BIG, ecp, fp::FP, fp2::FP2, fp4::FP4, rom};
 
 pub const ZERO: usize = 0;
 pub const ONE: usize = 1;

ic-agent/src/bls/bls12381/fp2.rs

@@ -17,12 +17,7 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::bls12381::fp;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::rom;
+use crate::bls::bls12381::{big, big::BIG, dbig::DBIG, fp, fp::FP, rom};
 
 use crate::bls::rand::RAND;
 

ic-agent/src/bls/bls12381/fp4.rs

@@ -17,14 +17,12 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::fp;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::fp2::FP2;
 #[allow(unused_imports)]
 use crate::bls::bls12381::rom;
-use crate::bls::rand::RAND;
+use crate::bls::{
+    bls12381::{big, big::BIG, fp, fp::FP, fp2::FP2},
+    rand::RAND,
+};
 
 #[derive(Copy, Clone)]
 pub struct FP4 {

ic-agent/src/bls/bls12381/mpin.rs

@@ -17,19 +17,11 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big;
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::dbig::DBIG;
-use crate::bls::bls12381::ecp;
-use crate::bls::bls12381::ecp::ECP;
-use crate::bls::bls12381::ecp2::ECP2;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::fp12::FP12;
-use crate::bls::bls12381::pair;
-use crate::bls::bls12381::rom;
-
-use crate::bls::hmac;
-use crate::bls::rand::RAND;
+use crate::bls::bls12381::{
+    big, big::BIG, dbig::DBIG, ecp, ecp::ECP, ecp2::ECP2, fp::FP, fp12::FP12, pair, rom,
+};
+
+use crate::bls::{hmac, rand::RAND};
 
 /* MPIN 128-bit API Functions */
 

ic-agent/src/bls/bls12381/pair.rs

@@ -17,16 +17,9 @@
  * limitations under the License.
  */
 
-use crate::bls::bls12381::big::BIG;
-use crate::bls::bls12381::ecp;
-use crate::bls::bls12381::ecp::ECP;
-use crate::bls::bls12381::ecp2::ECP2;
-use crate::bls::bls12381::fp::FP;
-use crate::bls::bls12381::fp12;
-use crate::bls::bls12381::fp12::FP12;
-use crate::bls::bls12381::fp2::FP2;
-use crate::bls::bls12381::fp4::FP4;
-use crate::bls::bls12381::rom;
+use crate::bls::bls12381::{
+    big::BIG, ecp, ecp::ECP, ecp2::ECP2, fp::FP, fp12, fp12::FP12, fp2::FP2, fp4::FP4, rom,
+};
 
 #[allow(unused_imports)]
 use crate::bls::bls12381::dbig::DBIG;

ic-agent/src/bls/bls12381/rom.rs

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 
-use crate::bls::arch::Chunk;
-use crate::bls::bls12381::big::NLEN;
+use crate::bls::{arch::Chunk, bls12381::big::NLEN};
 
 // Base Bits= 58
 // bls12381 Modulus

ic-agent/src/bls/gcm.rs

@@ -25,8 +25,7 @@ const GCM_FINISHED: usize = 3;
 //const GCM_ENCRYPTING: usize = 0;
 //const GCM_DECRYPTING: usize = 1;
 
-use crate::bls::aes;
-use crate::bls::aes::AES;
+use crate::bls::{aes, aes::AES};
 
 pub struct GCM {
     table: [[u32; 4]; 128],