Merge branch 'paul-btreemap-workaround' into integrate-content-wg

src/content_working_group/lib.rs

@@ -87,6 +87,8 @@ pub type StakeId<T> = <T as stake::Trait>::StakeId;
 /// Type of permissions module prinicipal identifiers
 pub type PrincipalId<T> = <T as versioned_store_permissions::Trait>::Credential;
 
+pub type CuratorApplicationIdToCuratorIdMap<T> = BTreeMap<CuratorApplicationId<T>, CuratorId<T>>;
+
 /*
  * MOVE ALL OF THESE OUT TO COMMON LATER
  */
@@ -1094,6 +1096,7 @@ decl_event! {
         CuratorOpeningId = CuratorOpeningId<T>,
         CuratorApplicationId = CuratorApplicationId<T>,
         CuratorId = CuratorId<T>,
+        CuratorApplicationIdToCuratorIdMap = CuratorApplicationIdToCuratorIdMap<T>,
         <T as system::Trait>::AccountId,
     {
         ChannelCreated(ChannelId),
@@ -1103,7 +1106,7 @@ decl_event! {
         CuratorOpeningAdded(CuratorOpeningId),
         AcceptedCuratorApplications(CuratorOpeningId),
         BeganCuratorApplicationReview(CuratorOpeningId),
-        CuratorOpeningFilled(CuratorOpeningId, BTreeMap<CuratorApplicationId, CuratorId>), //BTreeSet<CuratorApplicationId>),
+        CuratorOpeningFilled(CuratorOpeningId, CuratorApplicationIdToCuratorIdMap), //BTreeSet<CuratorApplicationId>),
         TerminatedCurator(CuratorId),
         AppliedOnCuratorOpening(CuratorOpeningId, CuratorApplicationId),
         CuratorExited(CuratorId),

src/content_working_group/mock.rs

@@ -63,6 +63,7 @@ pub type RawLibTestEvent = lib::RawEvent<
     CuratorOpeningId<Test>,
     CuratorApplicationId<Test>,
     CuratorId<Test>,
+    CuratorApplicationIdToCuratorIdMap<Test>,
     <Test as system::Trait>::AccountId,
 >;