Browse Source

Remove user-defined lifetime from the service discovery module

- remove user-defined lifetime from the service discovery module (set_ipns_id).
Shamil Gadelshin 4 years ago
parent
commit
3f55431770

+ 2 - 12
runtime-modules/service-discovery/src/lib.rs

@@ -118,28 +118,18 @@ decl_module! {
             origin,
             storage_provider_id: StorageProviderId<T>,
             id: Vec<u8>,
-            lifetime: Option<T::BlockNumber>
         ) {
             <StorageBureaucracy<T>>::ensure_worker_signed(origin, &storage_provider_id)?;
 
             // TODO: ensure id is a valid base58 encoded IPNS identity
 
-            let ttl = lifetime.map_or(Self::default_lifetime(), |value| {
-                let min_lifetime = T::BlockNumber::from(MINIMUM_LIFETIME);
-                if value >= min_lifetime {
-                    value
-                } else {
-                    min_lifetime
-                }
-            });
-
             //
             // == MUTATION SAFE ==
             //
 
             <AccountInfoByStorageProviderId<T>>::insert(storage_provider_id, AccountInfo {
                 identity: id.clone(),
-                expires_at: <system::Module<T>>::block_number() + ttl,
+                expires_at: <system::Module<T>>::block_number() + Self::default_lifetime(),
             });
 
             Self::deposit_event(RawEvent::AccountInfoUpdated(storage_provider_id, id));
@@ -172,7 +162,7 @@ decl_module! {
         }
 
         /// Sets bootstrap endpoints for the Colossus. Requires root privileges.
-        pub fn set_bootstrap_endpoints(origin, endpoints: Vec<Vec<u8>>) {
+        pub fn set_bootstrap_endpoints(origin, endpoints: Vec<Url>) {
             ensure_root(origin)?;
 
             // == MUTATION SAFE ==

+ 1 - 3
runtime-modules/service-discovery/src/tests.rs

@@ -14,12 +14,11 @@ fn set_ipns_id() {
         let (storage_provider_account_id, storage_provider_id) = hire_storage_provider();
 
         let identity = "alice".as_bytes().to_vec();
-        let ttl = <Test as system::Trait>::BlockNumber::from(MINIMUM_LIFETIME + 100);
+        let ttl = <Test as system::Trait>::BlockNumber::from(DEFAULT_LIFETIME);
         assert!(Discovery::set_ipns_id(
             Origin::signed(storage_provider_account_id),
             storage_provider_id,
             identity.clone(),
-            Some(ttl)
         )
         .is_ok());
 
@@ -54,7 +53,6 @@ fn set_ipns_id() {
             Origin::signed(invalid_storage_provider_id),
             invalid_storage_provider_account_id,
             identity.clone(),
-            None
         )
         .is_err());
         assert!(!<AccountInfoByStorageProviderId<Test>>::exists(