Merge branch 'main' into domain-digest

autonomys · Aug 28, 2023 · c526d00 · c526d00
2 parents fe19d7a + 0117e95
commit c526d00
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/crates/pallet-domains/src/lib.rs b/crates/pallet-domains/src/lib.rs
@@ -908,19 +908,18 @@ mod pallet {
             domain_config: DomainConfig,
             raw_genesis: Vec<u8>,
         ) -> DispatchResult {
-            let who = if raw_genesis.is_empty() {
-                ensure_signed(origin)?
+            let (who, raw_genesis) = if raw_genesis.is_empty() {
+                (ensure_signed(origin)?, None)
             } else {
                 // TODO: remove once XDM is finished
                 ensure_root(origin)?;
-                T::SudoId::get()
+                (T::SudoId::get(), Some(raw_genesis))
             };
 
             let created_at = frame_system::Pallet::<T>::current_block_number();
 
-            let domain_id =
-                do_instantiate_domain::<T>(domain_config, who, created_at, Some(raw_genesis))
-                    .map_err(Error::<T>::from)?;
+            let domain_id = do_instantiate_domain::<T>(domain_config, who, created_at, raw_genesis)
+                .map_err(Error::<T>::from)?;
 
             Self::deposit_event(Event::DomainInstantiated { domain_id });