Fix test

Author: boundless-forest

frame/dvm-dynamic-fee/src/lib.rs

@@ -17,28 +17,26 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-// #[cfg(test)]
-// mod mock;
-// #[cfg(test)]
-// mod tests;
+// --- substrate ---
+use sp_core::U256;
+#[cfg(feature = "std")]
+use sp_inherents::InherentDataProvider as InherentDataProviderT;
+use sp_inherents::{Error, InherentData, InherentIdentifier, IsFatalError};
+use sp_runtime::RuntimeDebug;
+// --- darwinia ---
+use darwinia_evm::FeeCalculator;
+// --- core ---
+use codec::{Decode, Encode};
+use core::cmp;
+
+pub use pallet::*;
+pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"dynfee0_";
 
 #[frame_support::pallet]
 pub mod pallet {
-	// --- core ---
-	use core::cmp;
-	// --- substrate ---
+	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use sp_core::U256;
-	#[cfg(feature = "std")]
-	use sp_inherents::InherentDataProvider as InherentDataProviderT;
-	use sp_inherents::{Error, IsFatalError};
-	// --- darwinia ---
-	use darwinia_evm::FeeCalculator;
-
-	pub type InherentType = U256;
-
-	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"dynfee0_";
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -56,16 +54,12 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type TargetMinGasPrice<T> = StorageValue<_, U256, OptionQuery>;
 
-	#[cfg_attr(feature = "std", derive(Default))]
 	#[pallet::genesis_config]
-	pub struct GenesisConfig {
-		pub min_gas_price: U256,
-	}
+	#[derive(Default)]
+	pub struct GenesisConfig;
 	#[pallet::genesis_build]
 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
-		fn build(&self) {
-			<MinGasPrice<T>>::put(self.min_gas_price);
-		}
+		fn build(&self) {}
 	}
 
 	#[pallet::pallet]
@@ -99,15 +93,11 @@ pub mod pallet {
 			ensure_none(origin)?;
 
 			<TargetMinGasPrice<T>>::set(Some(target));
-
 			Ok(().into())
 		}
 	}
-	impl<T: Config> FeeCalculator for Pallet<T> {
-		fn min_gas_price() -> U256 {
-			<MinGasPrice<T>>::get()
-		}
-	}
+
+	#[pallet::inherent]
 	impl<T: Config> ProvideInherent for Pallet<T> {
 		type Call = Call<T>;
 		type Error = InherentError;
@@ -116,7 +106,6 @@ pub mod pallet {
 
 		fn create_inherent(data: &InherentData) -> Option<Self::Call> {
 			let target = data.get_data::<InherentType>(&INHERENT_IDENTIFIER).ok()??;
-
 			Some(Call::note_min_gas_price_target(target))
 		}
 
@@ -128,42 +117,49 @@ pub mod pallet {
 			true
 		}
 	}
+}
+
+impl<T: Config> FeeCalculator for Pallet<T> {
+	fn min_gas_price() -> U256 {
+		<MinGasPrice<T>>::get()
+	}
+}
 
-	#[derive(Encode, Decode, RuntimeDebug)]
-	pub enum InherentError {}
-	impl IsFatalError for InherentError {
-		fn is_fatal_error(&self) -> bool {
-			match *self {}
-		}
+#[derive(Encode, Decode, RuntimeDebug)]
+pub enum InherentError {}
+impl IsFatalError for InherentError {
+	fn is_fatal_error(&self) -> bool {
+		match *self {}
 	}
+}
 
-	#[cfg(feature = "std")]
-	pub struct InherentDataProvider(pub InherentType);
-	#[cfg(feature = "std")]
-	impl InherentDataProvider {
-		pub fn from_target_gas_price(price: InherentType) -> Self {
-			Self(price)
-		}
+pub type InherentType = U256;
+#[cfg(feature = "std")]
+pub struct InherentDataProvider(pub InherentType);
+#[cfg(feature = "std")]
+impl InherentDataProvider {
+	pub fn from_target_gas_price(price: InherentType) -> Self {
+		Self(price)
 	}
-	#[cfg(feature = "std")]
-	#[async_trait::async_trait]
-	impl InherentDataProviderT for InherentDataProvider {
-		fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
-			inherent_data.put_data(INHERENT_IDENTIFIER, &self.0)
-		}
+}
 
-		async fn try_handle_error(
-			&self,
-			identifier: &InherentIdentifier,
-			error: &[u8],
-		) -> Option<Result<(), Error>> {
-			if *identifier != INHERENT_IDENTIFIER {
-				return None;
-			}
+#[cfg(feature = "std")]
+#[async_trait::async_trait]
+impl InherentDataProviderT for InherentDataProvider {
+	fn provide_inherent_data(&self, inherent_data: &mut InherentData) -> Result<(), Error> {
+		inherent_data.put_data(INHERENT_IDENTIFIER, &self.0)
+	}
 
-			let error = InherentError::decode(&mut &error[..]).ok()?;
-			Some(Err(Error::Application(Box::from(format!("{:?}", error)))))
+	async fn try_handle_error(
+		&self,
+		identifier: &InherentIdentifier,
+		error: &[u8],
+	) -> Option<Result<(), Error>> {
+		if *identifier != INHERENT_IDENTIFIER {
+			return None;
 		}
+
+		let error = InherentError::decode(&mut &error[..]).ok()?;
+		Some(Err(Error::Application(Box::from(format!("{:?}", error)))))
 	}
 }
-pub use pallet::*;