fix tests

bin/node-template/runtime/src/lib.rs

@@ -15,7 +15,7 @@ use sr_primitives::{
 	impl_opaque_keys, MultiSignature
 };
 use sr_primitives::traits::{
-	NumberFor, BlakeTwo256, Block as BlockT, StaticLookup, Verify, IdentifyAccount, Convert
+	NumberFor, BlakeTwo256, Block as BlockT, StaticLookup, ConvertWeight, Verify, IdentifyAccount
 };
 use sr_primitives::weights::{Weight, DispatchInfo};
 use sr_api::impl_runtime_apis;
@@ -209,14 +209,6 @@ impl balances::Trait for Runtime {
 	type CreationFee = CreationFee;
 }
 
-pub struct WeightToFee;
-
-impl Convert<DispatchInfo, Balance> for WeightToFee {
-	fn convert(info: DispatchInfo) -> Balance {
-		info.weight.into()
-	}
-}
-
 parameter_types! {
 	pub const TransactionBaseFee: Balance = 0;
 	pub const TransactionByteFee: Balance = 1;
@@ -227,7 +219,7 @@ impl transaction_payment::Trait for Runtime {
 	type OnTransactionPayment = ();
 	type TransactionBaseFee = TransactionBaseFee;
 	type TransactionByteFee = TransactionByteFee;
-	type WeightToFee = WeightToFee;
+	type WeightToFee = ConvertWeight;
 	type FeeMultiplierUpdate = ();
 }
 

bin/node/executor/src/lib.rs

@@ -43,7 +43,7 @@ mod tests {
 	use sr_primitives::{
 		Fixed64,
 		traits::{Header as HeaderT, Hash as HashT, Convert}, ApplyResult,
-		transaction_validity::InvalidTransaction, weights::GetDispatchInfo,
+		transaction_validity::InvalidTransaction, weights::{GetDispatchInfo, DispatchInfo},
 	};
 	use contracts::ContractAddressFor;
 	use substrate_executor::{NativeExecutor, WasmExecutionMethod};
@@ -90,7 +90,10 @@ mod tests {
 			(extrinsic.encode().len() as Balance);
 
 		let weight = default_transfer_call().get_dispatch_info().weight;
-		let weight_fee = <Runtime as transaction_payment::Trait>::WeightToFee::convert(weight);
+		let weight_fee = <Runtime as transaction_payment::Trait>::WeightToFee::convert(DispatchInfo {
+			weight,
+			class: Default::default(),
+		});
 
 		fee_multiplier.saturated_multiply_accumulate(length_fee + weight_fee) + TransferFee::get()
 	}
@@ -1077,7 +1080,10 @@ mod tests {
 			balance_alice -= length_fee;
 
 			let weight = default_transfer_call().get_dispatch_info().weight;
-			let weight_fee = LinearWeightToFee::<WeightFeeCoefficient>::convert(weight);
+			let weight_fee = LinearWeightToFee::<WeightFeeCoefficient>::convert(DispatchInfo {
+				weight,
+				class: Default::default(),
+			});
 
 			// we know that weight to fee multiplier is effect-less in block 1.
 			assert_eq!(weight_fee as Balance, MILLICENTS);

bin/node/runtime/src/impls.rs

@@ -228,7 +228,10 @@ mod tests {
 				if fm == next { panic!("The fee should ever increase"); }
 				fm = next;
 				iterations += 1;
-				let fee = <Runtime as transaction_payment::Trait>::WeightToFee::convert(tx_weight);
+				let fee = <Runtime as transaction_payment::Trait>::WeightToFee::convert(DispatchInfo {
+					weight: tx_weight,
+					class: Default::default(),
+				});
 				let adjusted_fee = fm.saturated_multiply_accumulate(fee);
 				println!(
 					"iteration {}, new fm = {:?}. Fee at this point is: {} units / {} millicents, \

palette/balances/src/mock.rs

@@ -18,7 +18,7 @@
 
 #![cfg(test)]
 
-use sr_primitives::{Perbill, traits::{ConvertInto, IdentityLookup}, testing::Header,
+use sr_primitives::{Perbill, traits::{ConvertWeight, IdentityLookup}, testing::Header,
 	weights::{DispatchInfo, Weight}};
 use primitives::H256;
 use runtime_io;
@@ -87,7 +87,7 @@ impl transaction_payment::Trait for Runtime {
 	type OnTransactionPayment = ();
 	type TransactionBaseFee = TransactionBaseFee;
 	type TransactionByteFee = TransactionByteFee;
-	type WeightToFee = ConvertInto;
+	type WeightToFee = ConvertWeight;
 	type FeeMultiplierUpdate = ();
 }
 impl Trait for Runtime {

palette/executive/src/lib.rs

@@ -317,7 +317,7 @@ mod tests {
 	use primitives::H256;
 	use sr_primitives::{
 		generic::Era, Perbill, DispatchError, weights::Weight, testing::{Digest, Header, Block},
-		traits::{Bounded, Header as HeaderT, BlakeTwo256, IdentityLookup, ConvertInto},
+		traits::{Bounded, Header as HeaderT, BlakeTwo256, IdentityLookup, ConvertWeight},
 		transaction_validity::{InvalidTransaction, UnknownTransaction}, ApplyError,
 	};
 	use support::{
@@ -434,7 +434,7 @@ mod tests {
 		type OnTransactionPayment = ();
 		type TransactionBaseFee = TransactionBaseFee;
 		type TransactionByteFee = TransactionByteFee;
-		type WeightToFee = ConvertInto;
+		type WeightToFee = ConvertWeight;
 		type FeeMultiplierUpdate = ();
 	}
 	impl custom::Trait for Runtime {}

palette/transaction-payment/src/lib.rs

@@ -236,7 +236,7 @@ mod tests {
 		Perbill,
 		testing::{Header, TestXt},
 		traits::{BlakeTwo256, IdentityLookup, Extrinsic},
-		weights::{DispatchClass, DispatchInfo, GetDispatchInfo},
+		weights::{Weight, DispatchClass, DispatchInfo, GetDispatchInfo},
 	};
 	use balances::Call as BalancesCall;
 	use rstd::cell::RefCell;
@@ -318,9 +318,9 @@ mod tests {
 	}
 
 	pub struct WeightToFee(u64);
-	impl Convert<Weight, u64> for WeightToFee {
-		fn convert(t: Weight) -> u64 {
-			WEIGHT_TO_FEE.with(|v| *v.borrow() * (t as u64))
+	impl Convert<DispatchInfo, u64> for WeightToFee {
+		fn convert(t: DispatchInfo) -> u64 {
+			WEIGHT_TO_FEE.with(|v| *v.borrow() * (t.weight as u64))
 		}
 	}
 

primitives/sr-primitives/src/traits.rs

@@ -29,7 +29,7 @@ use crate::transaction_validity::{
 	ValidTransaction, TransactionValidity, TransactionValidityError, UnknownTransaction,
 };
 use crate::generic::{Digest, DigestItem};
-use crate::weights::DispatchInfo;
+use crate::weights::{DispatchInfo, Weight};
 pub use arithmetic::traits::{
 	SimpleArithmetic, UniqueSaturatedInto, UniqueSaturatedFrom, Saturating, SaturatedConversion,
 	Zero, One, Bounded, CheckedAdd, CheckedSub, CheckedMul, CheckedDiv,
@@ -235,6 +235,14 @@ impl<A, B: From<A>> Convert<A, B> for ConvertInto {
 	fn convert(a: A) -> B { a.into() }
 }
 
+pub struct ConvertWeight;
+
+impl<Balance: From<Weight>> Convert<DispatchInfo, Balance> for ConvertWeight {
+	fn convert(info: DispatchInfo) -> Balance {
+		info.weight.into()
+	}
+}
+
 /// Convenience type to work around the highly unergonomic syntax needed
 /// to invoke the functions of overloaded generic traits, in this case
 /// `TryFrom` and `TryInto`.