Refactor forum module: remove BlockchainTimestamp

Use BlockAndTime from the common module instead of duplicated BlockchainTimestamp.

runtime-modules/forum/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = 'substrate-forum-module'
-version = '1.2.0'
+version = '1.2.1'
 authors = ['Joystream contributors']
 edition = '2018'
 

runtime-modules/forum/src/lib.rs

@@ -18,6 +18,7 @@ use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Para
 use system::{ensure_signed, RawOrigin};
 
 pub use common::constraints::InputValidationLengthConstraint;
+use common::BlockAndTime;
 
 mod mock;
 mod tests;
@@ -72,20 +73,12 @@ pub trait ForumUserRegistry<AccountId> {
     fn get_forum_user(id: &AccountId) -> Option<ForumUser<AccountId>>;
 }
 
-/// Convenient composite time stamp
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
-#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)]
-pub struct BlockchainTimestamp<BlockNumber, Moment> {
-    block: BlockNumber,
-    time: Moment,
-}
-
 /// Represents a moderation outcome applied to a post or a thread.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)]
 pub struct ModerationAction<BlockNumber, Moment, AccountId> {
     /// When action occured.
-    moderated_at: BlockchainTimestamp<BlockNumber, Moment>,
+    moderated_at: BlockAndTime<BlockNumber, Moment>,
 
     /// Account forum sudo which acted.
     moderator_id: AccountId,
@@ -99,7 +92,7 @@ pub struct ModerationAction<BlockNumber, Moment, AccountId> {
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)]
 pub struct PostTextChange<BlockNumber, Moment> {
     /// When this expiration occured
-    expired_at: BlockchainTimestamp<BlockNumber, Moment>,
+    expired_at: BlockAndTime<BlockNumber, Moment>,
 
     /// Text that expired
     text: Vec<u8>,
@@ -132,7 +125,7 @@ pub struct Post<BlockNumber, Moment, AccountId, ThreadId, PostId> {
     text_change_history: Vec<PostTextChange<BlockNumber, Moment>>,
 
     /// When post was submitted.
-    created_at: BlockchainTimestamp<BlockNumber, Moment>,
+    created_at: BlockAndTime<BlockNumber, Moment>,
 
     /// Author of post.
     author_id: AccountId,
@@ -175,7 +168,7 @@ pub struct Thread<BlockNumber, Moment, AccountId, ThreadId> {
     num_moderated_posts: u32,
 
     /// When thread was established.
-    created_at: BlockchainTimestamp<BlockNumber, Moment>,
+    created_at: BlockAndTime<BlockNumber, Moment>,
 
     /// Author of post.
     author_id: AccountId,
@@ -216,7 +209,7 @@ pub struct Category<BlockNumber, Moment, AccountId> {
     description: Vec<u8>,
 
     /// When category was established.
-    created_at: BlockchainTimestamp<BlockNumber, Moment>,
+    created_at: BlockAndTime<BlockNumber, Moment>,
 
     /// Whether category is deleted.
     deleted: bool,
@@ -443,7 +436,7 @@ decl_module! {
                 id : next_category_id,
                 title,
                 description,
-                created_at : Self::current_block_and_time(),
+                created_at : common::current_block_time::<T>(),
                 deleted: false,
                 archived: false,
                 num_direct_subcategories: 0,
@@ -603,7 +596,7 @@ decl_module! {
 
             // Add moderation to thread
             thread.moderation = Some(ModerationAction {
-                moderated_at: Self::current_block_and_time(),
+                moderated_at: common::current_block_time::<T>(),
                 moderator_id: who,
                 rationale
             });
@@ -689,7 +682,7 @@ decl_module! {
             <PostById<T>>::mutate(post_id, |p| {
 
                 let expired_post_text = PostTextChange {
-                    expired_at: Self::current_block_and_time(),
+                    expired_at: common::current_block_time::<T>(),
                     text: post.current_text.clone()
                 };
 
@@ -726,7 +719,7 @@ decl_module! {
 
             // Update moderation action on post
             let moderation_action = ModerationAction{
-                moderated_at: Self::current_block_and_time(),
+                moderated_at: common::current_block_time::<T>(),
                 moderator_id: who,
                 rationale
             };
@@ -799,13 +792,6 @@ impl<T: Trait> Module<T> {
         )
     }
 
-    fn current_block_and_time() -> BlockchainTimestamp<T::BlockNumber, T::Moment> {
-        BlockchainTimestamp {
-            block: <system::Module<T>>::block_number(),
-            time: <timestamp::Module<T>>::now(),
-        }
-    }
-
     fn ensure_post_is_mutable(
         post_id: T::PostId,
     ) -> Result<Post<T::BlockNumber, T::Moment, T::AccountId, T::ThreadId, T::PostId>, &'static str>
@@ -991,7 +977,7 @@ impl<T: Trait> Module<T> {
             moderation: None,
             num_unmoderated_posts: 0,
             num_moderated_posts: 0,
-            created_at: Self::current_block_and_time(),
+            created_at: common::current_block_time::<T>(),
             author_id: author_id.clone(),
         };
 
@@ -1031,7 +1017,7 @@ impl<T: Trait> Module<T> {
             current_text: text.to_owned(),
             moderation: None,
             text_change_history: vec![],
-            created_at: Self::current_block_and_time(),
+            created_at: common::current_block_time::<T>(),
             author_id: author_id.clone(),
         };
 

runtime-modules/forum/src/mock.rs

@@ -1,6 +1,7 @@
 #![cfg(test)]
 
 use crate::*;
+use common::BlockAndTime;
 
 use primitives::H256;
 
@@ -544,10 +545,8 @@ pub type RuntimePost = Post<
     RuntimeThreadId,
     RuntimePostId,
 >;
-pub type RuntimeBlockchainTimestamp = BlockchainTimestamp<
-    <Runtime as system::Trait>::BlockNumber,
-    <Runtime as timestamp::Trait>::Moment,
->;
+pub type RuntimeBlockchainTimestamp =
+    BlockAndTime<<Runtime as system::Trait>::BlockNumber, <Runtime as timestamp::Trait>::Moment>;
 pub type RuntimeThreadId = <Runtime as Trait>::ThreadId;
 pub type RuntimePostId = <Runtime as Trait>::PostId;