fix: typo field name on opinion requestor struct (#400)

abdulhakim2902 · web-flow · commit 098190379788 · 2023-02-11T23:47:13.000+07:00
diff --git a/pallets/electronic-medical-record/src/lib.rs b/pallets/electronic-medical-record/src/lib.rs
@@ -569,11 +569,11 @@ impl<T: Config> ElectronicMedicalRecordFilesProvider<T> for Pallet<T> {
 
 	fn valid_electronic_medical_record_id(
 		account_id: &T::AccountId,
-		electronical_medical_record_ids: &[T::Hash],
+		electronic_medical_record_ids: &[T::Hash],
 	) -> Vec<T::Hash> {
 		let mut valid_ids = Vec::new();
 
-		for electronic_medical_record_id in electronical_medical_record_ids.iter() {
+		for electronic_medical_record_id in electronic_medical_record_ids.iter() {
 			let electronic_medical_record =
 				<Self as ElectronicMedicalRecordInterface<T>>::electronic_medical_record_by_id(
 					electronic_medical_record_id,
diff --git a/pallets/electronic-medical-record/traits/src/lib.rs b/pallets/electronic-medical-record/traits/src/lib.rs
@@ -18,7 +18,7 @@ pub trait ElectronicMedicalRecordFilesProvider<T: Config + TimeConfig> {
 	) -> Option<Self::ElectronicMedicalRecordFile>;
 	fn valid_electronic_medical_record_id(
 		account_id: &T::AccountId,
-		electronical_medical_record_ids: &[T::Hash],
+		electronic_medical_record_ids: &[T::Hash],
 	) -> Vec<T::Hash>;
 }
 
diff --git a/pallets/opinion-requestor/src/impl_opinion_requestor.rs b/pallets/opinion-requestor/src/impl_opinion_requestor.rs
@@ -15,16 +15,16 @@ impl<T: Config> OpinionRequestorInterface<T> for Pallet<T> {
 		let total_requestor = OpinionRequestorCount::<T>::get();
 
 		let id = Self::generate_opinion_requestor_id(account_id, total_requestor);
-		let electronical_medical_record_ids = info.electronical_medical_record_ids();
+		let electronic_medical_record_ids = info.electronic_medical_record_ids();
 		let valid_ids = T::ElectronicMedicalRecord::valid_electronic_medical_record_id(
 			account_id,
-			electronical_medical_record_ids,
+			electronic_medical_record_ids,
 		);
 
 		let mut requestor_info = info;
 
 		requestor_info.update_opinion_ids(&Vec::new());
-		requestor_info.update_electronical_medical_record_ids(&valid_ids);
+		requestor_info.update_electronic_medical_record_ids(&valid_ids);
 
 		let now = pallet_timestamp::Pallet::<T>::get();
 		let requestor = OpinionRequestor::new(&id, account_id, &requestor_info, now);
@@ -52,16 +52,16 @@ impl<T: Config> OpinionRequestorInterface<T> for Pallet<T> {
 			.is_authorized_owner(account_id)
 			.ok_or(Error::<T>::Unauthorized)?;
 
-		let electronical_medical_record_ids = info.electronical_medical_record_ids();
+		let electronic_medical_record_ids = info.electronic_medical_record_ids();
 		let valid_ids = T::ElectronicMedicalRecord::valid_electronic_medical_record_id(
 			account_id,
-			electronical_medical_record_ids,
+			electronic_medical_record_ids,
 		);
 
 		let opinion_ids = requestor.info().opinion_ids();
 		let mut requestor_info = info;
 
-		requestor_info.update_electronical_medical_record_ids(&valid_ids);
+		requestor_info.update_electronic_medical_record_ids(&valid_ids);
 		requestor_info.update_opinion_ids(opinion_ids);
 
 		requestor.update_info(requestor_info.clone(), now);
diff --git a/pallets/opinion-requestor/src/migrations.rs b/pallets/opinion-requestor/src/migrations.rs
@@ -32,7 +32,7 @@ mod version {
 			pub struct OldRequestorInfo<Hash> {
 				category: Vec<u8>,
 				description: Vec<u8>,
-				electronical_medical_record_ids: Vec<Hash>,
+				electronic_medical_record_ids: Vec<Hash>,
 				opinion_ids: Vec<Hash>,
 				myriad_url: Vec<u8>,
 			}
@@ -56,7 +56,7 @@ mod version {
 				let new_requester_info = RequestorInfo::new(
 					&old_requestor_info.category,
 					&old_requestor_info.description,
-					&old_requestor_info.electronical_medical_record_ids,
+					&old_requestor_info.electronic_medical_record_ids,
 					&old_requestor_info.opinion_ids,
 					&old_requestor_info.myriad_url,
 				);
diff --git a/pallets/opinion-requestor/src/types.rs b/pallets/opinion-requestor/src/types.rs
@@ -82,7 +82,7 @@ where
 {
 	category: Vec<u8>,
 	description: Vec<u8>,
-	electronical_medical_record_ids: Vec<Hash>,
+	electronic_medical_record_ids: Vec<Hash>,
 	opinion_ids: Vec<Hash>,
 	myriad_post_id: Vec<u8>,
 }
@@ -93,14 +93,14 @@ where
 	pub fn new(
 		category: &[u8],
 		description: &[u8],
-		electronical_medical_record_ids: &[Hash],
+		electronic_medical_record_ids: &[Hash],
 		opinion_ids: &[Hash],
 		myriad_post_id: &[u8],
 	) -> Self {
 		Self {
 			category: category.to_vec(),
 			description: description.to_vec(),
-			electronical_medical_record_ids: electronical_medical_record_ids.to_vec(),
+			electronic_medical_record_ids: electronic_medical_record_ids.to_vec(),
 			opinion_ids: opinion_ids.to_vec(),
 			myriad_post_id: myriad_post_id.to_vec(),
 		}
@@ -111,8 +111,8 @@ where
 		&self.opinion_ids
 	}
 
-	pub fn electronical_medical_record_ids(&self) -> &[Hash] {
-		&self.electronical_medical_record_ids
+	pub fn electronic_medical_record_ids(&self) -> &[Hash] {
+		&self.electronic_medical_record_ids
 	}
 
 	// SET Method
@@ -132,10 +132,7 @@ where
 		self.opinion_ids = opinion_ids.to_vec();
 	}
 
-	pub fn update_electronical_medical_record_ids(
-		&mut self,
-		electronical_medical_record_ids: &[Hash],
-	) {
-		self.electronical_medical_record_ids = electronical_medical_record_ids.to_vec();
+	pub fn update_electronic_medical_record_ids(&mut self, electronic_medical_record_ids: &[Hash]) {
+		self.electronic_medical_record_ids = electronic_medical_record_ids.to_vec();
 	}
 }
diff --git a/pallets/opinion-requestor/tests/src/lib.rs b/pallets/opinion-requestor/tests/src/lib.rs
@@ -25,8 +25,8 @@ mod test {
 			));
 
 			let result = ElectronicMedicalRecord::electronic_medical_record_by_owner_id(1);
-			let electronical_medical_record_ids = result.unwrap();
-			let electronical_medical_record_id = electronical_medical_record_ids[0];
+			let electronic_medical_record_ids = result.unwrap();
+			let electronical_medical_record_id = electronic_medical_record_ids[0];
 			let random_electronical_medical_record_id =
 				Keccak256::hash("0xDb9Af2d1f3ADD2726A132AA7A65Cc9E6fC5761C3".as_bytes());
 
@@ -81,8 +81,8 @@ mod test {
 			));
 
 			let result = ElectronicMedicalRecord::electronic_medical_record_by_owner_id(1);
-			let electronical_medical_record_ids = result.unwrap();
-			let electronical_medical_record_id = electronical_medical_record_ids[0];
+			let electronic_medical_record_ids = result.unwrap();
+			let electronical_medical_record_id = electronic_medical_record_ids[0];
 
 			let updated_info = RequestorInfo::new(
 				b"category",
@@ -147,8 +147,8 @@ mod test {
 			));
 
 			let result = ElectronicMedicalRecord::electronic_medical_record_by_owner_id(1);
-			let electronical_medical_record_ids = result.unwrap();
-			let electronical_medical_record_id = electronical_medical_record_ids[0];
+			let electronic_medical_record_ids = result.unwrap();
+			let electronical_medical_record_id = electronic_medical_record_ids[0];
 
 			let updated_info = RequestorInfo::new(
 				b"category",
diff --git a/pallets/orders/src/functions.rs b/pallets/orders/src/functions.rs
@@ -184,7 +184,7 @@ impl<T: Config> Pallet<T> {
 		asset_id: Option<u32>,
 		keep_alive: bool,
 	) -> Result<(), Error<T>> {
-		let _ = Self::do_balance_sufficient(sender, &amount, asset_id)?;
+		Self::do_balance_sufficient(sender, &amount, asset_id)?;
 
 		if currency == &CurrencyType::DBIO {
 			let existence = if keep_alive {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub trait ElectronicMedicalRecordFilesProvider<T: Config + TimeConfig> {`
`18`	`18`	`) -> Option<Self::ElectronicMedicalRecordFile>;`
`19`	`19`	`fn valid_electronic_medical_record_id(`
`20`	`20`	`account_id: &T::AccountId,`
`21`		`- electronical_medical_record_ids: &[T::Hash],`
	`21`	`+ electronic_medical_record_ids: &[T::Hash],`
`22`	`22`	`) -> Vec<T::Hash>;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ where`
`82`	`82`	`{`
`83`	`83`	`category: Vec<u8>,`
`84`	`84`	`description: Vec<u8>,`
`85`		`- electronical_medical_record_ids: Vec<Hash>,`
	`85`	`+ electronic_medical_record_ids: Vec<Hash>,`
`86`	`86`	`opinion_ids: Vec<Hash>,`
`87`	`87`	`myriad_post_id: Vec<u8>,`
`88`	`88`	`}`
`@@ -93,14 +93,14 @@ where`
`93`	`93`	`pub fn new(`
`94`	`94`	`category: &[u8],`
`95`	`95`	`description: &[u8],`
`96`		`- electronical_medical_record_ids: &[Hash],`
	`96`	`+ electronic_medical_record_ids: &[Hash],`
`97`	`97`	`opinion_ids: &[Hash],`
`98`	`98`	`myriad_post_id: &[u8],`
`99`	`99`	`) -> Self {`
`100`	`100`	`Self {`
`101`	`101`	`category: category.to_vec(),`
`102`	`102`	`description: description.to_vec(),`
`103`		`- electronical_medical_record_ids: electronical_medical_record_ids.to_vec(),`
	`103`	`+ electronic_medical_record_ids: electronic_medical_record_ids.to_vec(),`
`104`	`104`	`opinion_ids: opinion_ids.to_vec(),`
`105`	`105`	`myriad_post_id: myriad_post_id.to_vec(),`
`106`	`106`	`}`
`@@ -111,8 +111,8 @@ where`
`111`	`111`	`&self.opinion_ids`
`112`	`112`	`}`
`113`	`113`
`114`		`- pub fn electronical_medical_record_ids(&self) -> &[Hash] {`
`115`		`- &self.electronical_medical_record_ids`
	`114`	`+ pub fn electronic_medical_record_ids(&self) -> &[Hash] {`
	`115`	`+ &self.electronic_medical_record_ids`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// SET Method`
`@@ -132,10 +132,7 @@ where`
`132`	`132`	`self.opinion_ids = opinion_ids.to_vec();`
`133`	`133`	`}`
`134`	`134`
`135`		`- pub fn update_electronical_medical_record_ids(`
`136`		`- &mut self,`
`137`		`- electronical_medical_record_ids: &[Hash],`
`138`		`- ) {`
`139`		`- self.electronical_medical_record_ids = electronical_medical_record_ids.to_vec();`
	`135`	`+ pub fn update_electronic_medical_record_ids(&mut self, electronic_medical_record_ids: &[Hash]) {`
	`136`	`+ self.electronic_medical_record_ids = electronic_medical_record_ids.to_vec();`
`140`	`137`	`}`
`141`	`138`	`}`