merge: completed.

debionetwork · Oct 8, 2021 · fdda6c0 · fdda6c0
1 parent 9dc8223
commit fdda6c0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/SHA256SUMS b/SHA256SUMS
@@ -1 +1 @@
-a641c2bcb8d52c7ce9709a2ac7e2b83150051de6a59e9e053c99116c2c7b5f54  debioSpec.json
+33bbd3b4f16635efef636072169d5d20df43c04e0fe17e46f2166adb30cc8b4b  debioSpec.json
diff --git a/debioSpec.json b/debioSpec.json
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -1,7 +1,7 @@
 use debio_runtime::{
 	currency::DBIO, AccountId, BalancesConfig, GenesisConfig, Signature, GrandpaConfig,
 	SudoConfig, SystemConfig, BabeConfig, 
-	WASM_BINARY, OrdersConfig,
+	WASM_BINARY, OrdersConfig, RewardsConfig,
 };
 use sc_service::{ChainType, Properties};
 use sp_core::{sr25519, Pair, Public};
@@ -10,7 +10,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
 
 use debio_runtime::BeefyConfig;
 use debio_runtime::{
-	opaque::SessionKeys, Balance, ImOnlineConfig, SessionConfig, DOLLARS,
+	opaque::SessionKeys, Balance, ImOnlineConfig, SessionConfig,
 };
 use debio_runtime::{OctopusAppchainConfig, OctopusLposConfig};
 use beefy_primitives::crypto::AuthorityId as BeefyId;
@@ -102,6 +102,9 @@ pub fn development_config() -> Result<ChainSpec, String> {
 			// Orders Pallet admin key
 			// API Server   5GRjDZsTCatwWfNosGF8QRAPR1zYPJ7jJppt224tjE7x8cSx
 			hex!["c0f9aaa3ce6b6c57eadc5fef443aaf8152fa8e49a8fc684ecc47c3304fdf3c0c"].into(),
+			// Rewarders Pallet admin key
+			// API Server   5GRjDZsTCatwWfNosGF8QRAPR1zYPJ7jJppt224tjE7x8cSx
+			hex!["c0f9aaa3ce6b6c57eadc5fef443aaf8152fa8e49a8fc684ecc47c3304fdf3c0c"].into(),
 			// Pre-funded accounts
 			vec![
 				// Sudo         5EpzDTRWDoVTnE31ybM2tse77CkZyG2eKC58Z3gbALHphHN6
@@ -151,6 +154,9 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 			// Orders Pallet admin key
 			// API Server   5GRjDZsTCatwWfNosGF8QRAPR1zYPJ7jJppt224tjE7x8cSx
 			hex!["c0f9aaa3ce6b6c57eadc5fef443aaf8152fa8e49a8fc684ecc47c3304fdf3c0c"].into(),
+			// Rewarders Pallet admin key
+			// API Server   5GRjDZsTCatwWfNosGF8QRAPR1zYPJ7jJppt224tjE7x8cSx
+			hex!["c0f9aaa3ce6b6c57eadc5fef443aaf8152fa8e49a8fc684ecc47c3304fdf3c0c"].into(),
 			// Pre-funded accounts
 			vec![
 				// Sudo     5EpzDTRWDoVTnE31ybM2tse77CkZyG2eKC58Z3gbALHphHN6
@@ -182,6 +188,7 @@ fn testnet_genesis(
 	initial_nominators: Vec<AccountId>,
 	root_key: AccountId,
 	orders_escrow_key: AccountId,
+    rewarder_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	_enable_println: bool,
 ) -> GenesisConfig {
@@ -254,5 +261,8 @@ fn testnet_genesis(
 		orders: OrdersConfig {
 			escrow_key: orders_escrow_key,
 		},
+        rewards: RewardsConfig {
+            rewarder_key: rewarder_key,
+        },
 	}
 }
diff --git a/pallets/doctors/src/lib.rs b/pallets/doctors/src/lib.rs
@@ -128,7 +128,7 @@ pub mod pallet {
     use crate::*;
     use codec::EncodeLike;
     use frame_support::traits::Currency;
-    use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*};
+    use frame_support::{dispatch::DispatchResultWithPostInfo};
     use frame_system::pallet_prelude::*;
     pub use sp_std::prelude::*;
     pub use traits_doctor_certifications::{

diff --git a/pallets/hospitals/src/lib.rs b/pallets/hospitals/src/lib.rs
@@ -128,7 +128,7 @@ pub mod pallet {
     use crate::*;
     use codec::EncodeLike;
     use frame_support::traits::Currency;
-    use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*};
+    use frame_support::{dispatch::DispatchResultWithPostInfo};
     use frame_system::pallet_prelude::*;
     pub use sp_std::prelude::*;
     pub use traits_hospital_certifications::{

diff --git a/pallets/rewards/Cargo.toml b/pallets/rewards/Cargo.toml
@@ -33,11 +33,9 @@ sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkado
 [features]
 default = ['std']
 std = [
-    'serde/std',
 	'codec/std',
 	'sp-std/std',
     'sp-io/std',
 	'frame-support/std',
 	'frame-system/std',
-	'user-profile/std',
 ]
diff --git a/pallets/rewards/src/lib.rs b/pallets/rewards/src/lib.rs
@@ -145,8 +145,8 @@ impl<T: Config> RewardInterface<T> for Pallet<T> {
             return Err(Error::<T>::Unauthorized);
         }
 
-        // let imbalance = T::Currency::slash_reserved(to_punish, *collateral).0;
-        // T::Slash::on_unbalanced(imbalance);
+        let imbalance = T::Currency::slash_reserved(to_punish, collateral).0;
+        T::Slash::on_unbalanced(imbalance);
 
         Ok(().into())
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a641c2bcb8d52c7ce9709a2ac7e2b83150051de6a59e9e053c99116c2c7b5f54 debioSpec.json
		33bbd3b4f16635efef636072169d5d20df43c04e0fe17e46f2166adb30cc8b4b debioSpec.json