added fields AnnouncementSigner and CommunityRules to CommunityMetada…

…ta (#336)

* added filed AnnouncementSigner to CommunityMetadata

* fmt

* clippy

* add CommunityRules enum to CommunityMetadata

* move outdated types to migrations file and add skeleton for v2

* implemented migration to v2

* implemented explicit migration with cropping. not yet working

* migration test passes. still need to sort out things

* clippy

* cleanup

* test migration v1 to v2 as well

* clippy

* explicit migration naming

* fix v1->v2 typing

* use upstream truncate_from instead of own

* get rid of MultiSigner in AnnouncementSigner

* explicit migration naming

* fix tests

* bump crate versions

ceremonies/src/migrations.rs

@@ -22,9 +22,9 @@ mod v0 {
 pub mod v1 {
 	use super::*;
 
-	pub struct Migration<T>(sp_std::marker::PhantomData<T>);
+	pub struct MigrateToV1<T>(sp_std::marker::PhantomData<T>);
 
-	impl<T: Config + frame_system::Config> OnRuntimeUpgrade for Migration<T> {
+	impl<T: Config + frame_system::Config> OnRuntimeUpgrade for MigrateToV1<T> {
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
 			assert_eq!(StorageVersion::get::<Pallet<T>>(), 0, "can only upgrade from version 0");
@@ -123,9 +123,9 @@ mod test {
 			v0::AttestationRegistry::<TestRuntime>::insert((cids[1], 2), 3, attestations_2.clone());
 
 			// Migrate.
-			let state = v1::Migration::<TestRuntime>::pre_upgrade().unwrap();
-			let _weight = v1::Migration::<TestRuntime>::on_runtime_upgrade();
-			v1::Migration::<TestRuntime>::post_upgrade(state).unwrap();
+			let state = v1::MigrateToV1::<TestRuntime>::pre_upgrade().unwrap();
+			let _weight = v1::MigrateToV1::<TestRuntime>::on_runtime_upgrade();
+			v1::MigrateToV1::<TestRuntime>::post_upgrade(state).unwrap();
 
 			// Check that all values got migrated.
 
@@ -201,7 +201,7 @@ mod test {
 				attestations,
 			);
 			// Migrate.
-			let state = v1::Migration::<TestRuntime>::pre_upgrade();
+			let state = v1::MigrateToV1::<TestRuntime>::pre_upgrade();
 			assert_err!(state, "too many attestations");
 		});
 	}

communities/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-encointer-communities"
-version = "1.2.0"
+version = "1.3.0"
 authors = ["encointer.org <[email protected]>"]
 edition = "2021"
 

communities/rpc/src/tests.rs

@@ -15,6 +15,7 @@
 // along with Encointer.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::*;
+use encointer_primitives::common::{FromStr, PalletString};
 use sp_core::offchain::storage::InMemOffchainStorage;
 
 #[test]
@@ -24,7 +25,8 @@ fn caching_works() {
 	let communities: CommunitiesRpc<_, (), _> =
 		CommunitiesRpc::new(Arc::new(client), storage, true);
 
-	let cid_names = vec![CidName::new(Default::default(), "hello world".into())];
+	let cid_names =
+		vec![CidName::new(Default::default(), PalletString::from_str("hello world").unwrap())];
 
 	assert!(communities.cache_dirty());
 	communities.set_storage(CIDS_KEY, &cid_names);

communities/src/lib.rs

@@ -54,7 +54,7 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(PhantomData<T>);