Add Arbitrary for Principal and extend random for Func

rust/candid/Cargo.toml

@@ -50,7 +50,7 @@ bignum = ["num-bigint", "num-traits"]
 value = ["bignum"]
 printer = ["pretty"]
 default = ["serde_bytes", "printer", "bignum"]
-all = ["default", "value"]
+all = ["default", "value", "ic_principal/arbitrary"]
 
 [[test]]
 name = "types"

rust/candid_parser/src/random.rs

@@ -140,7 +140,7 @@ impl<'a> GenState<'a> {
             TypeInner::Int64 => IDLValue::Int64(arbitrary_num(u, self.config.range)?),
             TypeInner::Float32 => IDLValue::Float32(u.arbitrary()?),
             TypeInner::Float64 => IDLValue::Float64(u.arbitrary()?),
-            TypeInner::Principal => IDLValue::Principal(candid::Principal::anonymous()),
+            TypeInner::Principal => IDLValue::Principal(crate::Principal::arbitrary(u)?),
             TypeInner::Text => {
                 IDLValue::Text(arbitrary_text(u, &self.config.text, &self.config.width)?)
             }
@@ -204,6 +204,10 @@ impl<'a> GenState<'a> {
                 };
                 IDLValue::Variant(VariantValue(Box::new(field), idx as u64))
             }
+            TypeInner::Func(_) => IDLValue::Func(
+                crate::Principal::arbitrary(u)?,
+                arbitrary_text(u, &self.config.text, &self.config.width)?,
+            ),
             _ => unimplemented!(),
         });
         self.pop_state(old_config, ty, false);

rust/ic_principal/Cargo.toml

@@ -34,6 +34,11 @@ optional = true
 version = "0.11.5"
 optional = true
 
+[dependencies.arbitrary]
+version = "1.0"
+optional = true
+
 [features]
 # Default features include serde support.
 default = ['serde', 'serde_bytes']
+arbitrary = ['default', 'dep:arbitrary']

rust/ic_principal/src/lib.rs

@@ -5,6 +5,9 @@ use std::convert::TryFrom;
 use std::fmt::Write;
 use thiserror::Error;
 
+#[cfg(feature = "arbitrary")]
+use arbitrary::{Arbitrary, Result as ArbitraryResult, Unstructured};
+
 /// An error happened while encoding, decoding or serializing a [`Principal`].
 #[derive(Error, Clone, Debug, Eq, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -358,3 +361,28 @@ impl<'de> serde::Deserialize<'de> for Principal {
         }
     }
 }
+
+#[cfg(feature = "arbitrary")]
+impl<'a> Arbitrary<'a> for Principal {
+    fn arbitrary(u: &mut Unstructured<'a>) -> ArbitraryResult<Self> {
+        let principal = match u8::arbitrary(u)? {
+            u8::MAX => Principal::management_canister(),
+            254u8 => Principal::anonymous(),
+            _ => {
+                let length: usize = u.int_in_range(1..=Principal::MAX_LENGTH_IN_BYTES)?;
+                let mut result: Vec<u8> = Vec::with_capacity(length);
+                for _ in 0..length {
+                    result.push(u8::arbitrary(u)?);
+                }
+                // non-anonymous principal cannot have type ANONYMOUS
+                // adapt by changing the last byte.
+                let last = result.last_mut().unwrap();
+                if *last == 4_u8 {
+                    *last = u8::MAX
+                }
+                Principal::try_from(&result[..]).unwrap()
+            }
+        };
+        Ok(principal)
+    }
+}