feat: fixed linting

debionetwork · Sep 22, 2022 · 8db49d0 · 8db49d0
1 parent 8b17c5d
commit 8db49d0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/pallets/service-request/benchmarking/src/lib.rs b/pallets/service-request/benchmarking/src/lib.rs
@@ -10,7 +10,8 @@ use frame_system::RawOrigin;
 use labs::{Config as LabsConfig, LabInfo, LabVerifierKey, Pallet as Labs};
 #[allow(unused)]
 use service_request::{
-	AdminKey, Call, Config as ServiceRequestConfig, Pallet as ServiceRequest, RequestByAccountId, ServicePrice,
+	AdminKey, Call, Config as ServiceRequestConfig, Pallet as ServiceRequest, RequestByAccountId,
+	ServicePrice,
 };
 
 use primitives_area_code::{CityCode, CountryCode, RegionCode};

diff --git a/pallets/service-request/benchmarking/src/mock.rs b/pallets/service-request/benchmarking/src/mock.rs
@@ -2,7 +2,7 @@
 
 use super::*;
 
-use frame_support::{parameter_types, PalletId, traits::GenesisBuild};
+use frame_support::{parameter_types, traits::GenesisBuild, PalletId};
 use frame_system as system;
 use pallet_balances::AccountData;
 use scale_info::TypeInfo;

diff --git a/pallets/service-request/src/functions.rs b/pallets/service-request/src/functions.rs
@@ -40,11 +40,11 @@ impl<T: Config> Pallet<T> {
 		let name = <T::Assets as fungibles::InspectMetadata<T::AccountId>>::name(&asset_id);
 		let symbol = <T::Assets as fungibles::InspectMetadata<T::AccountId>>::symbol(&asset_id);
 
-		if name.len() == 0 {
+		if name.is_empty() {
 			return Err(Error::<T>::AssetNotExists)
 		}
 
-		if symbol.len() == 0 {
+		if symbol.is_empty() {
 			return Err(Error::<T>::AssetNotExists)
 		}
 

diff --git a/pallets/service-request/src/impl_service_request.rs b/pallets/service-request/src/impl_service_request.rs
@@ -233,7 +233,7 @@ impl<T: Config> SeviceRequestInterface<T> for Pallet<T> {
 		let total_price = service_price.total_price();
 
 		Self::do_transfer(
-			&asset_id,
+			asset_id,
 			&requester_id,
 			&Self::staking_account_id(request_id),
 			total_price,
@@ -300,31 +300,35 @@ impl<T: Config> SeviceRequestInterface<T> for Pallet<T> {
 
 			// Transfer testing price back to customer
 			Self::do_transfer(
-				&asset_id,
+				asset_id,
 				&Self::staking_account_id(request_id),
 				&requester_id,
 				testing_price,
 				false,
 			)?;
 		}
 
-		// Transfer asset_id to lab_id
+		// Transfer qc_price to lab_id
 		Self::do_transfer(
-			&asset_id,
+			asset_id,
 			&Self::staking_account_id(request_id),
 			&lab_id,
 			pay_amount,
 			false,
 		)?;
 
-		// Transfer DBIO to requester_id
-		Self::do_transfer(
-			b"native",
-			&Self::staking_account_id(request_id),
-			&requester_id,
-			request.staking_amount,
-			false,
-		)?;
+		let balance = CurrencyOf::<T>::free_balance(&Self::staking_account_id(request_id));
+
+		if !balance.is_zero() {
+			// Transfer DBIO to requester_id
+			Self::do_transfer(
+				b"native",
+				&Self::staking_account_id(request_id),
+				&requester_id,
+				balance,
+				false,
+			)?;
+		}
 
 		let now = T::TimeProvider::now().as_millis();
 

diff --git a/pallets/service-request/src/mock.rs b/pallets/service-request/src/mock.rs
@@ -238,9 +238,10 @@ impl ExternalityBuilder {
 		let lab = account_key("lab");
 		let customer = account_key("customer");
 		let other = account_key("other");
+		let owner = account_key("owner");
 
 		pallet_assets::GenesisConfig::<Test> {
-			assets: vec![(1, 4, true, 1)],
+			assets: vec![(1, owner, true, 1)],
 			metadata: vec![(1, b"USDT".to_vec(), b"USDT".to_vec(), 6)],
 			accounts: vec![(1, admin, 100), (1, customer, 200), (1, lab, 300), (1, other, 400)],
 		}