diff --git a/pallets/asset_management/src/functions.rs b/pallets/asset_management/src/functions.rs index 925ae50f..b0a54cf0 100644 --- a/pallets/asset_management/src/functions.rs +++ b/pallets/asset_management/src/functions.rs @@ -226,7 +226,7 @@ impl Pallet { let proposal_hash = T::Hashing::hash_of(&call_dispatch); let proposal_encoded: Vec = call_dispatch.encode(); Dem::Pallet::::note_preimage(origin, proposal_encoded).ok(); - + proposal_hash } diff --git a/pallets/tenancy/src/lib.rs b/pallets/tenancy/src/lib.rs index 6b0d9838..3fde0c18 100644 --- a/pallets/tenancy/src/lib.rs +++ b/pallets/tenancy/src/lib.rs @@ -173,8 +173,6 @@ pub mod pallet { let caller = ensure_signed(origin.clone())?; // Ensure that the caller has the tenancy role ensure!(Roles::TenantLog::::contains_key(caller.clone()), Error::::NotATenant); - - // Ensure that the asset is valid let collection_id: T::NftCollectionId = asset_type.value().into(); @@ -182,14 +180,19 @@ pub mod pallet { ensure!(ownership.is_some(), Error::::NotAnAsset); let virtual_account = ownership.unwrap().virtual_account; - if !Tenants::::contains_key(caller.clone()){ - RegisteredTenant::::new(caller.clone(), info.clone(), Some(virtual_account.clone())).ok(); - }else{ + if !Tenants::::contains_key(caller.clone()) { + RegisteredTenant::::new( + caller.clone(), + info.clone(), + Some(virtual_account.clone()), + ) + .ok(); + } else { let mut val0 = Self::infos(&caller).unwrap(); - Tenants::::mutate(&caller,|val|{ + Tenants::::mutate(&caller, |val| { val0.asset_requested = Some(virtual_account.clone()); *val = Some(val0); - }); + }); } Self::request_helper(origin.clone(), virtual_account.clone(), info).ok(); @@ -237,12 +240,9 @@ pub mod pallet { Error::::NotAValidPayment ); - Self::payment_helper(origin, virtual_account.clone(), collection_id, asset_id).ok(); let now = >::block_number(); - - Self::deposit_event(Event::GuarantyDepositPayment { tenant: caller, when: now,