[utils] Introduce Span (and rename array to sequence) (#1337)

Author: patrick-ogrady

consensus/src/marshal/actor.rs

@@ -25,7 +25,7 @@ use commonware_storage::{
     archive::{self, immutable, prunable, Archive as _, Identifier},
     translator::TwoCap,
 };
-use commonware_utils::{array::U64, Array};
+use commonware_utils::{sequence::U64, Array};
 use futures::{
     channel::{mpsc, oneshot},
     try_join, StreamExt,

consensus/src/marshal/finalizer.rs

@@ -1,7 +1,7 @@
 use crate::{marshal::ingress::orchestrator::Orchestrator, Block, Reporter};
 use commonware_runtime::{Clock, Metrics, Spawner, Storage};
 use commonware_storage::metadata::{self, Metadata};
-use commonware_utils::array::FixedBytes;
+use commonware_utils::sequence::FixedBytes;
 use futures::{channel::mpsc, StreamExt};
 use tracing::{debug, error};
 

cryptography/src/blake3/mod.rs

@@ -24,7 +24,7 @@ use crate::Hasher;
 use blake3::Hash;
 use bytes::{Buf, BufMut};
 use commonware_codec::{Error as CodecError, FixedSize, Read, ReadExt, Write};
-use commonware_utils::{hex, Array};
+use commonware_utils::{hex, Array, Span};
 use rand::{CryptoRng, Rng};
 use std::{
     fmt::{Debug, Display},
@@ -128,6 +128,8 @@ impl FixedSize for Digest {
     const SIZE: usize = DIGEST_LENGTH;
 }
 
+impl Span for Digest {}
+
 impl Array for Digest {}
 
 impl From<Hash> for Digest {

cryptography/src/bls12381/scheme.rs

@@ -34,7 +34,7 @@ use bytes::{Buf, BufMut};
 use commonware_codec::{
     DecodeExt, EncodeFixed, Error as CodecError, FixedSize, Read, ReadExt, Write,
 };
-use commonware_utils::{hex, union_unique};
+use commonware_utils::{hex, union_unique, Span};
 use rand::{CryptoRng, Rng};
 use std::{
     borrow::Cow,
@@ -74,6 +74,8 @@ impl FixedSize for PrivateKey {
     const SIZE: usize = group::PRIVATE_KEY_LENGTH;
 }
 
+impl Span for PrivateKey {}
+
 impl Array for PrivateKey {}
 
 impl Hash for PrivateKey {
@@ -200,6 +202,8 @@ impl FixedSize for PublicKey {
     const SIZE: usize = <MinPk as Variant>::Public::SIZE;
 }
 
+impl Span for PublicKey {}
+
 impl Array for PublicKey {}
 
 impl Hash for PublicKey {
@@ -288,6 +292,8 @@ impl FixedSize for Signature {
     const SIZE: usize = <MinPk as Variant>::Signature::SIZE;
 }
 
+impl Span for Signature {}
+
 impl Array for Signature {}
 
 impl Hash for Signature {

cryptography/src/bls12381/tle.rs

@@ -89,7 +89,7 @@ use crate::{
 };
 use bytes::{Buf, BufMut};
 use commonware_codec::{EncodeSize, FixedSize, Read, ReadExt, Write};
-use commonware_utils::array::FixedBytes;
+use commonware_utils::sequence::FixedBytes;
 use rand::{CryptoRng, Rng};
 
 /// Domain separation tag for hashing the `h3` message to a scalar.

cryptography/src/ed25519/scheme.rs

@@ -1,7 +1,7 @@
 use crate::{Array, BatchVerifier, PrivateKeyExt};
 use bytes::{Buf, BufMut};
 use commonware_codec::{Error as CodecError, FixedSize, Read, ReadExt, Write};
-use commonware_utils::{hex, union_unique};
+use commonware_utils::{hex, union_unique, Span};
 use ed25519_consensus::{self, VerificationKey};
 use rand::{CryptoRng, Rng, RngCore};
 use std::{
@@ -75,6 +75,8 @@ impl FixedSize for PrivateKey {
     const SIZE: usize = PRIVATE_KEY_LENGTH;
 }
 
+impl Span for PrivateKey {}
+
 impl Array for PrivateKey {}
 
 impl Eq for PrivateKey {}
@@ -189,6 +191,8 @@ impl FixedSize for PublicKey {
     const SIZE: usize = PUBLIC_KEY_LENGTH;
 }
 
+impl Span for PublicKey {}
+
 impl Array for PublicKey {}
 
 impl AsRef<[u8]> for PublicKey {
@@ -252,6 +256,8 @@ impl FixedSize for Signature {
     const SIZE: usize = SIGNATURE_LENGTH;
 }
 
+impl Span for Signature {}
+
 impl Array for Signature {}
 
 impl Hash for Signature {

cryptography/src/secp256r1/scheme.rs

@@ -1,7 +1,7 @@
 use crate::{Array, PrivateKeyExt};
 use bytes::{Buf, BufMut};
 use commonware_codec::{Error as CodecError, FixedSize, Read, ReadExt, Write};
-use commonware_utils::{hex, union_unique};
+use commonware_utils::{hex, union_unique, Span};
 use p256::{
     ecdsa::{
         signature::{Signer, Verifier},
@@ -91,6 +91,8 @@ impl FixedSize for PrivateKey {
     const SIZE: usize = PRIVATE_KEY_LENGTH;
 }
 
+impl Span for PrivateKey {}
+
 impl Array for PrivateKey {}
 
 impl Hash for PrivateKey {
@@ -196,6 +198,8 @@ impl FixedSize for PublicKey {
     const SIZE: usize = PUBLIC_KEY_LENGTH;
 }
 
+impl Span for PublicKey {}
+
 impl Array for PublicKey {}
 
 impl Hash for PublicKey {
@@ -271,6 +275,8 @@ impl FixedSize for Signature {
     const SIZE: usize = SIGNATURE_LENGTH;
 }
 
+impl Span for Signature {}
+
 impl Array for Signature {}
 
 impl Hash for Signature {

cryptography/src/sha256/mod.rs

@@ -23,7 +23,7 @@
 use crate::Hasher;
 use bytes::{Buf, BufMut};
 use commonware_codec::{DecodeExt, Error as CodecError, FixedSize, Read, ReadExt, Write};
-use commonware_utils::{hex, Array};
+use commonware_utils::{hex, Array, Span};
 use rand::{CryptoRng, Rng};
 use sha2::{Digest as _, Sha256 as ISha256};
 use std::{
@@ -122,6 +122,8 @@ impl FixedSize for Digest {
     const SIZE: usize = DIGEST_LENGTH;
 }
 
+impl Span for Digest {}
+
 impl Array for Digest {}
 
 impl From<[u8; DIGEST_LENGTH]> for Digest {

resolver/src/lib.rs

@@ -1,14 +1,14 @@
 //! Resolve data identified by a fixed-length key.
 
-use commonware_utils::Array;
+use commonware_utils::Span;
 use std::future::Future;
 
 pub mod p2p;
 
 /// Notified when data is available, and must validate it.
 pub trait Consumer: Clone + Send + 'static {
     /// Type used to uniquely identify data.
-    type Key: Array;
+    type Key: Span;
 
     /// Type of data to retrieve.
     type Value;
@@ -31,7 +31,7 @@ pub trait Consumer: Clone + Send + 'static {
 /// Responsible for fetching data and notifying a `Consumer`.
 pub trait Resolver: Clone + Send + 'static {
     /// Type used to uniquely identify data.
-    type Key: Array;
+    type Key: Span;
 
     /// Initiate a fetch request.
     fn fetch(&mut self, key: Self::Key) -> impl Future<Output = ()> + Send;

resolver/src/p2p/mocks/consumer.rs

@@ -1,4 +1,4 @@
-use crate::Array;
+use crate::Span;
 use futures::{channel::mpsc, SinkExt};
 use std::collections::HashMap;
 
@@ -14,7 +14,7 @@ pub enum Event<K, V> {
 
 /// A consumer that can be used for testing
 #[derive(Clone)]
-pub struct Consumer<K: Array, V> {
+pub struct Consumer<K: Span, V> {
     /// The sender to send events to
     sender: mpsc::UnboundedSender<Event<K, V>>,
 
@@ -24,7 +24,7 @@ pub struct Consumer<K: Array, V> {
     expected: HashMap<K, V>,
 }
 
-impl<K: Array, V: Clone + PartialEq> Consumer<K, V> {
+impl<K: Span, V: Clone + PartialEq> Consumer<K, V> {
     /// Create a new consumer
     ///
     /// Returns the consumer and a receiver that can be used to get the events
@@ -59,7 +59,7 @@ impl<K: Array, V: Clone + PartialEq> Consumer<K, V> {
     }
 }
 
-impl<K: Array, V: Clone + PartialEq + Send + 'static> crate::Consumer for Consumer<K, V> {
+impl<K: Span, V: Clone + PartialEq + Send + 'static> crate::Consumer for Consumer<K, V> {
     type Key = K;
     type Value = V;
     type Failure = ();