staking: Flexible generation of reward curve and associated tweaks

.gitignore

@@ -24,4 +24,4 @@ rls*.log
 .cargo/
 .cargo-remote.toml
 *.bin
-*.iml
+*.iml

frame/gilt/src/lib.rs

@@ -516,14 +516,14 @@ pub mod pallet {
 			let totals = ActiveTotal::<T>::get();
 
 			let total_issuance = T::Currency::total_issuance();
-			let nongilt_issuance = total_issuance.saturating_sub(totals.frozen);
-			let effective_issuance = totals.proportion.left_from_one()
+			let non_gilt = total_issuance.saturating_sub(totals.frozen);
+			let effective = totals.proportion.left_from_one()
 				.saturating_reciprocal_mul(nongilt_issuance);
 
 			IssuanceInfo {
 				reserved: totals.frozen,
-				non_gilt: nongilt_issuance,
-				effective: effective_issuance,
+				non_gilt,
+				effective,
 			}
 		}
 

frame/gilt/src/mock.rs

@@ -103,7 +103,7 @@ ord_parameter_types! {
 impl pallet_gilt::Config for Test {
 	type Event = Event;
 	type Currency = Balances;
-	type CurrencyBalance = u64;
+	type CurrencyBalance = <Self as pallet_balances::Config>::Balance;
 	type AdminOrigin = frame_system::EnsureSignedBy<One, Self::AccountId>;
 	type Deficit = ();
 	type Surplus = ();