Generate arbitrary id for MuxedAddress

Author: dmkozh

soroban-sdk/src/muxed_address.rs

@@ -279,13 +279,13 @@ impl TryFromVal<Env, ScAddress> for MuxedAddress {
 #[cfg(any(test, feature = "testutils"))]
 #[cfg_attr(feature = "docs", doc(cfg(feature = "testutils")))]
 impl crate::testutils::MuxedAddress for MuxedAddress {
-    fn generate(env: &Env, id: u64) -> crate::MuxedAddress {
+    fn generate(env: &Env) -> crate::MuxedAddress {
         let sc_val = ScVal::Address(crate::env::internal::xdr::ScAddress::MuxedAccount(
             crate::env::internal::xdr::MuxedEd25519Account {
                 ed25519: crate::env::internal::xdr::Uint256(
                     env.with_generator(|mut g| g.address()),
                 ),
-                id,
+                id: env.with_generator(|mut g| g.mux_id()),
             },
         ));
         sc_val.try_into_val(env).unwrap()

soroban-sdk/src/tests/muxed_address.rs

@@ -31,7 +31,7 @@ fn test_contract_address_to_muxed_address_conversion() {
 #[test]
 fn test_muxed_address_component_getters() {
     let env = Env::default();
-    let muxed_address = MuxedAddress::generate(&env, 123_456);
+    let muxed_address = MuxedAddress::generate(&env);
     let mut expected_id = [0_u8; 32];
     expected_id[31] = 1;
     let expected_address = Address::try_from_val(
@@ -42,7 +42,6 @@ fn test_muxed_address_component_getters() {
     )
     .unwrap();
     assert_eq!(muxed_address.address(), expected_address);
-    assert_eq!(muxed_address.id(), Some(123_456));
 
     let muxed_address_with_another_id = MuxedAddress::new(muxed_address, u64::MAX);
     assert_eq!(muxed_address_with_another_id.address(), expected_address);

soroban-sdk/src/testutils.rs

@@ -178,14 +178,16 @@ impl AuthSnapshot {
 #[serde(rename_all = "snake_case")]
 pub struct Generators {
     address: u64,
-    nonce: u64,
+    nonce: i64,
+    mux_id: u64,
 }
 
 impl Default for Generators {
     fn default() -> Generators {
         Generators {
             address: 0,
             nonce: 0,
+            mux_id: 0,
         }
     }
 }
@@ -230,7 +232,12 @@ impl Generators {
 
     pub fn nonce(&mut self) -> i64 {
         self.nonce = self.nonce.checked_add(1).unwrap();
-        self.nonce as i64
+        self.nonce
+    }
+
+    pub fn mux_id(&mut self) -> u64 {
+        self.mux_id = self.mux_id.checked_add(1).unwrap();
+        self.mux_id
     }
 }
 
@@ -439,12 +446,11 @@ pub trait Address {
 }
 
 pub trait MuxedAddress {
-    /// Create a new MuxedAddress with arbitrary `Address` part and provided
-    /// multiplexing identifier.
+    /// Create a new MuxedAddress with arbitrary `Address` and id parts.
     ///
     /// Note, that since currently only accounts can be multiplexed, the
     /// underlying `Address` will be an account (not contract) address.
-    fn generate(env: &Env, id: u64) -> crate::MuxedAddress;
+    fn generate(env: &Env) -> crate::MuxedAddress;
 
     /// Returns a new `MuxedAddress` that has the same `Address` part as the
     /// provided `address` and the provided multiplexing id.