add migration

Cargo.toml

@@ -75,11 +75,11 @@ rev = 'df5e65927780b323482e2e8b5031822f423a032d'
 
 [dependencies.parity-codec]
 default-features = false
-version = '3.0'
+version = '3.1'
 
 [dependencies.parity-codec-derive]
 default-features = false
-version = '3.0'
+version = '3.1'
 
 [dependencies.primitives]
 default_features = false

src/lib.rs

@@ -252,7 +252,7 @@ construct_runtime!(
 		CouncilElection: election::{Module, Call, Storage, Event<T>, Config<T>},
 		Council: council::{Module, Call, Storage, Event<T>, Config<T>},
 		Memo: memo::{Module, Call, Storage, Event<T>},
-		Membership: membership::{Module, Call, Storage, Event<T>},
+		Membership: membership::{Module, Call, Storage, Event<T>, Config<T>},
 	}
 );
 

src/membership.rs

@@ -3,11 +3,12 @@
 use rstd::prelude::*;
 use parity_codec::Codec;
 use parity_codec_derive::{Encode, Decode};
-use srml_support::{StorageMap, dispatch::Result, decl_module, decl_storage, decl_event, ensure, Parameter};
+use srml_support::{StorageMap, StorageValue, dispatch::Result, decl_module, decl_storage, decl_event, ensure, Parameter};
 use srml_support::traits::{Currency};
 use runtime_primitives::traits::{Zero, SimpleArithmetic, As, Member, MaybeSerializeDebug};
 use system::{self, ensure_signed};
 use crate::governance::{GovernanceCurrency, BalanceOf };
+use runtime_io::print;
 
 pub trait Trait: system::Trait + GovernanceCurrency {
     type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
@@ -19,20 +20,20 @@ pub trait Trait: system::Trait + GovernanceCurrency {
     type SubscriptionId: Parameter + Member + SimpleArithmetic + Codec + Default + Copy + As<usize> + As<u32> + MaybeSerializeDebug;
 }
 
-const FIRST_MEMBER_ID: u64 = 1;
+const DEFAULT_FIRST_MEMBER_ID: u64 = 1;
 const FIRST_PAID_TERMS_ID: u64 = 1;
 
-// Default "implicit" paid terms
+// Default paid membership terms
 const DEFAULT_PAID_TERM_ID: u64 = 0;
-const DEFAULT_PAID_TERM_FEE: u64 = 100;
+const DEFAULT_PAID_TERM_FEE: u64 = 100; // Can be overidden in genesis config
 const DEFAULT_PAID_TERM_TEXT: &str = "Default Paid Term TOS...";
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+//#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
 #[derive(Encode, Decode)]
 pub struct Profile<T: Trait> {
-    id: T::MemberId, // is it necessary to have the id in the struct?
+    id: T::MemberId,
     handle: u32,
-    avatarUri: Vec<u8>,
+    avatar_uri: Vec<u8>,
     description: Vec<u8>,
     added: T::BlockNumber,
     entry: EntryMethod<T>,
@@ -40,18 +41,18 @@ pub struct Profile<T: Trait> {
     subscription: Option<T::SubscriptionId>
 }
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+//#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
 #[derive(Encode, Decode)]
 pub enum EntryMethod<T: Trait> {
     Paid(T::PaidTermId),
     Screening(T::AccountId),
 }
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+//#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
 #[derive(Encode, Decode)]
 pub struct PaidMembershipTerms<T: Trait> {
     /// Unique identifier - the term id
-    id: T::PaidTermId, // is it necessary to have id in the struct?
+    id: T::PaidTermId,
     /// Quantity of native tokens which must be provably burned
     fee: BalanceOf<T>,
     /// String of capped length describing human readable conditions which are being agreed upon
@@ -68,14 +69,12 @@ impl<T: Trait> Default for PaidMembershipTerms<T> {
     }
 }
 
-// TEST: do initial values and build methods get called for store items when the runtime is
-// an upgrade? if not we need a differnet way to set them...
 decl_storage! {
-    trait Store for Module<T: Trait> as MembersipRegistry {
-        FirstMemberId get(first_member_id) : T::MemberId = T::MemberId::sa(FIRST_MEMBER_ID);
+    trait Store for Module<T: Trait> as Membership {
+        FirstMemberId get(first_member_id) config(first_member_id): T::MemberId = T::MemberId::sa(DEFAULT_FIRST_MEMBER_ID);
 
         /// Id to assign to next member that is added to the registry
-        NextMemberId get(next_member_id) : T::MemberId = T::MemberId::sa(FIRST_MEMBER_ID);
+        NextMemberId get(next_member_id) build(|config: &GenesisConfig<T>| config.first_member_id): T::MemberId = T::MemberId::sa(DEFAULT_FIRST_MEMBER_ID);
 
         /// Mapping of member ids to their corresponding accountid
         MembersById get(members_by_id) : map T::MemberId => T::AccountId;
@@ -87,17 +86,35 @@ decl_storage! {
         // Value is Option<Profile> because it is not meaningful to have a Default value for Profile
         MemberProfile get(member_profile_preview) : map T::MemberId => Option<Profile<T>>;
 
-        /// Next paid membership terms id - 1 reserved for initial terms, (avoid 0 -> default value)
+        /// Next paid membership terms id
         NextPaidMembershipTermsId get(next_paid_membership_terms_id) : T::PaidTermId = T::PaidTermId::sa(FIRST_PAID_TERMS_ID);
 
         /// Paid membership terms record
-        PaidMembershipTermsById get(paid_membership_terms_by_id) : map T::PaidTermId => PaidMembershipTerms<T>;
+        // Remember to add _genesis_phantom_data: std::marker::PhantomData{} to membership
+        // genesis config if not providing config() or extra_genesis
+        PaidMembershipTermsById get(paid_membership_terms_by_id) build(|config: &GenesisConfig<T>| {
+            // This method only gets called when initializing storage, and is
+            // compiled as native code. (Will be called when building `raw` chainspec)
+            // So it can't be relied upon to initialize storage for runtimes updates.
+            // Initialization for updated runtime is done in run_migration()
+            let mut terms: PaidMembershipTerms<T> = Default::default();
+            terms.fee = BalanceOf::<T>::sa(config.default_paid_membership_fee);
+            vec![(terms.id, terms)]
+        }) : map T::PaidTermId => Option<PaidMembershipTerms<T>>;
 
         /// Active Paid membership terms
         ActivePaidMembershipTerms get(active_paid_membership_terms) : Vec<T::PaidTermId> = vec![T::PaidTermId::sa(DEFAULT_PAID_TERM_ID)];
 
         /// Is the platform is accepting new members or not
         PlatformAcceptingNewMemberships get(platform_accepting_new_memberships) : bool = true;
+
+        /// If we should run a migration and initialize new storage values introduced in new runtime
+        // This will initialize to false if starting at genesis (because the build() method will run),
+        // for a runtime upgrade it will return the default value when reading the first time.
+        ShouldRunMigration get(should_run_migration) build(|_| false) : bool = true;
+    }
+    add_extra_genesis {
+        config(default_paid_membership_fee): u64;
     }
 }
 
@@ -109,8 +126,26 @@ decl_event! {
     }
 }
 
+impl<T: Trait> Module<T> {
+    fn run_migration() {
+        if Self::should_run_migration() {
+            let default_terms: PaidMembershipTerms<T> = Default::default();
+            <PaidMembershipTermsById<T>>::insert(T::PaidTermId::sa(0), default_terms);
+            <ShouldRunMigration<T>>::put(false);
+        }
+    }
+}
+
 decl_module! {
     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
         fn deposit_event<T>() = default;
+
+        fn on_initialise(_now: T::BlockNumber) {
+            Self::run_migration();
+        }
+
+        fn on_finalise(_now: T::BlockNumber) {
+
+        }
     }
 }