temp - get rid of weight v2 errors for now

pallet/assets-ext/src/weights.rs

@@ -62,13 +62,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Futurepass DefaultProxy (r:1 w:0)
 	// Storage: Assets Metadata (r:1 w:1)
 	fn create_asset() -> Weight {
-		Weight::from_ref_time(175_374_000 as u64)
+		Weight::from_all(175_374_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(7 as u64))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 	}
 	// Storage: AssetsExt AssetDeposit (r:0 w:1)
 	fn set_asset_deposit() -> Weight {
-		Weight::from_ref_time(9_969_000 as u64)
+		Weight::from_all(9_969_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 }
@@ -82,13 +82,13 @@ impl WeightInfo for () {
 	// Storage: Futurepass DefaultProxy (r:1 w:0)
 	// Storage: Assets Metadata (r:1 w:1)
 	fn create_asset() -> Weight {
-		Weight::from_ref_time(175_374_000 as u64)
+		Weight::from_all(175_374_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(7 as u64))
 			.saturating_add(RocksDbWeight::get().writes(6 as u64))
 	}
 	// Storage: AssetsExt AssetDeposit (r:0 w:1)
 	fn set_asset_deposit() -> Weight {
-		Weight::from_ref_time(9_969_000 as u64)
+		Weight::from_all(9_969_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 }

pallet/crowdsale/src/weights.rs

@@ -73,14 +73,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Assets Account (r:1 w:1)
 	// Storage: Crowdsale SaleInfo (r:0 w:1)
 	fn initialize() -> Weight {
-		Weight::from_ref_time(243_613_000 as u64)
+		Weight::from_all(243_613_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(11 as u64))
 			.saturating_add(T::DbWeight::get().writes(10 as u64))
 	}
 	// Storage: Crowdsale SaleInfo (r:1 w:1)
 	// Storage: Crowdsale SaleEndBlocks (r:1 w:1)
 	fn enable() -> Weight {
-		Weight::from_ref_time(71_177_000 as u64)
+		Weight::from_all(71_177_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
@@ -90,7 +90,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Crowdsale SaleParticipation (r:1 w:1)
 	fn participate() -> Weight {
-		Weight::from_ref_time(158_737_000 as u64)
+		Weight::from_all(158_737_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(7 as u64))
 			.saturating_add(T::DbWeight::get().writes(7 as u64))
 	}
@@ -103,7 +103,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Crowdsale NextUnsignedAt (r:0 w:1)
 	fn distribute_crowdsale_rewards() -> Weight {
-		Weight::from_ref_time(244_482_000 as u64)
+		Weight::from_all(244_482_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(10 as u64))
 			.saturating_add(T::DbWeight::get().writes(9 as u64))
 	}
@@ -115,7 +115,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Crowdsale SaleDistribution (r:1 w:1)
 	fn claim_voucher() -> Weight {
-		Weight::from_ref_time(239_613_000 as u64)
+		Weight::from_all(239_613_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(10 as u64))
 			.saturating_add(T::DbWeight::get().writes(8 as u64))
 	}
@@ -126,14 +126,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Nft CollectionInfo (r:1 w:1)
 	// Storage: Nft PublicMintInfo (r:1 w:0)
 	fn redeem_voucher() -> Weight {
-		Weight::from_ref_time(177_082_000 as u64)
+		Weight::from_all(177_082_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(6 as u64))
 			.saturating_add(T::DbWeight::get().writes(4 as u64))
 	}
 	// Storage: Crowdsale SaleInfo (r:1 w:1)
 	// Storage: Crowdsale SaleDistribution (r:1 w:1)
 	fn try_force_distribution() -> Weight {
-		Weight::from_ref_time(66_937_000 as u64)
+		Weight::from_all(66_937_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
@@ -146,17 +146,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Crowdsale SaleDistribution (r:1 w:1)
 	/// The range of component `p` is `[1, 5]`.
 	fn on_initialize(p: u32, ) -> Weight {
-		Weight::from_ref_time(209_808_000 as u64)
+		Weight::from_all(209_808_000 as u64)
 			// Standard Error: 945_171
-			.saturating_add(Weight::from_ref_time(96_603_123 as u64).saturating_mul(p as u64))
+			.saturating_add(Weight::from_all(96_603_123 as u64).saturating_mul(p as u64))
 			.saturating_add(T::DbWeight::get().reads(12 as u64))
 			.saturating_add(T::DbWeight::get().reads((6 as u64).saturating_mul(p as u64)))
 			.saturating_add(T::DbWeight::get().writes(11 as u64))
 			.saturating_add(T::DbWeight::get().writes((5 as u64).saturating_mul(p as u64)))
 	}
 	// Storage: Crowdsale SaleEndBlocks (r:1 w:0)
 	fn on_initialize_empty() -> Weight {
-		Weight::from_ref_time(10_200_000 as u64)
+		Weight::from_all(10_200_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 	}
 }
@@ -174,14 +174,14 @@ impl WeightInfo for () {
 	// Storage: Assets Account (r:1 w:1)
 	// Storage: Crowdsale SaleInfo (r:0 w:1)
 	fn initialize() -> Weight {
-		Weight::from_ref_time(243_613_000 as u64)
+		Weight::from_all(243_613_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(11 as u64))
 			.saturating_add(RocksDbWeight::get().writes(10 as u64))
 	}
 	// Storage: Crowdsale SaleInfo (r:1 w:1)
 	// Storage: Crowdsale SaleEndBlocks (r:1 w:1)
 	fn enable() -> Weight {
-		Weight::from_ref_time(71_177_000 as u64)
+		Weight::from_all(71_177_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
@@ -191,7 +191,7 @@ impl WeightInfo for () {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Crowdsale SaleParticipation (r:1 w:1)
 	fn participate() -> Weight {
-		Weight::from_ref_time(158_737_000 as u64)
+		Weight::from_all(158_737_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(7 as u64))
 			.saturating_add(RocksDbWeight::get().writes(7 as u64))
 	}
@@ -204,7 +204,7 @@ impl WeightInfo for () {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Crowdsale NextUnsignedAt (r:0 w:1)
 	fn distribute_crowdsale_rewards() -> Weight {
-		Weight::from_ref_time(244_482_000 as u64)
+		Weight::from_all(244_482_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(10 as u64))
 			.saturating_add(RocksDbWeight::get().writes(9 as u64))
 	}
@@ -216,7 +216,7 @@ impl WeightInfo for () {
 	// Storage: System Account (r:2 w:2)
 	// Storage: Crowdsale SaleDistribution (r:1 w:1)
 	fn claim_voucher() -> Weight {
-		Weight::from_ref_time(239_613_000 as u64)
+		Weight::from_all(239_613_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(10 as u64))
 			.saturating_add(RocksDbWeight::get().writes(8 as u64))
 	}
@@ -227,14 +227,14 @@ impl WeightInfo for () {
 	// Storage: Nft CollectionInfo (r:1 w:1)
 	// Storage: Nft PublicMintInfo (r:1 w:0)
 	fn redeem_voucher() -> Weight {
-		Weight::from_ref_time(177_082_000 as u64)
+		Weight::from_all(177_082_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(6 as u64))
 			.saturating_add(RocksDbWeight::get().writes(4 as u64))
 	}
 	// Storage: Crowdsale SaleInfo (r:1 w:1)
 	// Storage: Crowdsale SaleDistribution (r:1 w:1)
 	fn try_force_distribution() -> Weight {
-		Weight::from_ref_time(66_937_000 as u64)
+		Weight::from_all(66_937_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(2 as u64))
 	}
@@ -247,17 +247,17 @@ impl WeightInfo for () {
 	// Storage: Crowdsale SaleDistribution (r:1 w:1)
 	/// The range of component `p` is `[1, 5]`.
 	fn on_initialize(p: u32, ) -> Weight {
-		Weight::from_ref_time(209_808_000 as u64)
+		Weight::from_all(209_808_000 as u64)
 			// Standard Error: 945_171
-			.saturating_add(Weight::from_ref_time(96_603_123 as u64).saturating_mul(p as u64))
+			.saturating_add(Weight::from_all(96_603_123 as u64).saturating_mul(p as u64))
 			.saturating_add(RocksDbWeight::get().reads(12 as u64))
 			.saturating_add(RocksDbWeight::get().reads((6 as u64).saturating_mul(p as u64)))
 			.saturating_add(RocksDbWeight::get().writes(11 as u64))
 			.saturating_add(RocksDbWeight::get().writes((5 as u64).saturating_mul(p as u64)))
 	}
 	// Storage: Crowdsale SaleEndBlocks (r:1 w:0)
 	fn on_initialize_empty() -> Weight {
-		Weight::from_ref_time(10_200_000 as u64)
+		Weight::from_all(10_200_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(1 as u64))
 	}
 }

pallet/dex/src/weights.rs

@@ -65,7 +65,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Assets Asset (r:2 w:2)
 	// Storage: Assets Account (r:4 w:4)
 	fn swap_with_exact_supply() -> Weight {
-		Weight::from_ref_time(212_601_000 as u64)
+		Weight::from_all(212_601_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(8 as u64))
 			.saturating_add(T::DbWeight::get().writes(7 as u64))
 	}
@@ -74,7 +74,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Assets Asset (r:2 w:2)
 	// Storage: Assets Account (r:4 w:4)
 	fn swap_with_exact_target() -> Weight {
-		Weight::from_ref_time(214_052_000 as u64)
+		Weight::from_all(214_052_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(8 as u64))
 			.saturating_add(T::DbWeight::get().writes(7 as u64))
 	}
@@ -91,7 +91,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Dex FeeTo (r:1 w:0)
 	// Storage: Dex TradingPairStatuses (r:0 w:1)
 	fn add_liquidity() -> Weight {
-		Weight::from_ref_time(418_386_000 as u64)
+		Weight::from_all(418_386_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(23 as u64))
 			.saturating_add(T::DbWeight::get().writes(20 as u64))
 	}
@@ -103,27 +103,27 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Dex LiquidityPoolLastK (r:1 w:1)
 	// Storage: Dex FeeTo (r:1 w:0)
 	fn remove_liquidity() -> Weight {
-		Weight::from_ref_time(338_661_000 as u64)
+		Weight::from_all(338_661_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(14 as u64))
 			.saturating_add(T::DbWeight::get().writes(12 as u64))
 	}
 	// Storage: Dex TradingPairLPToken (r:1 w:0)
 	// Storage: Dex TradingPairStatuses (r:1 w:1)
 	fn reenable_trading_pair() -> Weight {
-		Weight::from_ref_time(70_315_000 as u64)
+		Weight::from_all(70_315_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Dex TradingPairLPToken (r:1 w:0)
 	// Storage: Dex TradingPairStatuses (r:1 w:1)
 	fn disable_trading_pair() -> Weight {
-		Weight::from_ref_time(70_865_000 as u64)
+		Weight::from_all(70_865_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Dex FeeTo (r:0 w:1)
 	fn set_fee_to() -> Weight {
-		Weight::from_ref_time(41_952_000 as u64)
+		Weight::from_all(41_952_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 }
@@ -135,7 +135,7 @@ impl WeightInfo for () {
 	// Storage: Assets Asset (r:2 w:2)
 	// Storage: Assets Account (r:4 w:4)
 	fn swap_with_exact_supply() -> Weight {
-		Weight::from_ref_time(212_601_000 as u64)
+		Weight::from_all(212_601_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(8 as u64))
 			.saturating_add(RocksDbWeight::get().writes(7 as u64))
 	}
@@ -144,7 +144,7 @@ impl WeightInfo for () {
 	// Storage: Assets Asset (r:2 w:2)
 	// Storage: Assets Account (r:4 w:4)
 	fn swap_with_exact_target() -> Weight {
-		Weight::from_ref_time(214_052_000 as u64)
+		Weight::from_all(214_052_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(8 as u64))
 			.saturating_add(RocksDbWeight::get().writes(7 as u64))
 	}
@@ -161,7 +161,7 @@ impl WeightInfo for () {
 	// Storage: Dex FeeTo (r:1 w:0)
 	// Storage: Dex TradingPairStatuses (r:0 w:1)
 	fn add_liquidity() -> Weight {
-		Weight::from_ref_time(418_386_000 as u64)
+		Weight::from_all(418_386_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(23 as u64))
 			.saturating_add(RocksDbWeight::get().writes(20 as u64))
 	}
@@ -173,27 +173,27 @@ impl WeightInfo for () {
 	// Storage: Dex LiquidityPoolLastK (r:1 w:1)
 	// Storage: Dex FeeTo (r:1 w:0)
 	fn remove_liquidity() -> Weight {
-		Weight::from_ref_time(338_661_000 as u64)
+		Weight::from_all(338_661_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(14 as u64))
 			.saturating_add(RocksDbWeight::get().writes(12 as u64))
 	}
 	// Storage: Dex TradingPairLPToken (r:1 w:0)
 	// Storage: Dex TradingPairStatuses (r:1 w:1)
 	fn reenable_trading_pair() -> Weight {
-		Weight::from_ref_time(70_315_000 as u64)
+		Weight::from_all(70_315_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Dex TradingPairLPToken (r:1 w:0)
 	// Storage: Dex TradingPairStatuses (r:1 w:1)
 	fn disable_trading_pair() -> Weight {
-		Weight::from_ref_time(70_865_000 as u64)
+		Weight::from_all(70_865_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(2 as u64))
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Dex FeeTo (r:0 w:1)
 	fn set_fee_to() -> Weight {
-		Weight::from_ref_time(41_952_000 as u64)
+		Weight::from_all(41_952_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 }

pallet/doughnut/src/weights.rs

@@ -63,22 +63,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: MaintenanceMode BlockedCalls (r:1 w:0)
 	// Storage: MaintenanceMode BlockedPallets (r:1 w:0)
 	fn transact() -> Weight {
-		Weight::from_ref_time(209_000_000 as u64)
+		Weight::from_all(209_000_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 	}
 	// Storage: Doughnut BlockedDoughnuts (r:0 w:1)
 	fn revoke_doughnut() -> Weight {
-		Weight::from_ref_time(14_000_000 as u64)
+		Weight::from_all(14_000_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Doughnut BlockedHolders (r:0 w:1)
 	fn revoke_holder() -> Weight {
-		Weight::from_ref_time(5_000_000 as u64)
+		Weight::from_all(5_000_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 	// Storage: Doughnut WhitelistedHolders (r:0 w:1)
 	fn update_whitelisted_holders() -> Weight {
-		Weight::from_ref_time(4_000_000 as u64)
+		Weight::from_all(4_000_000 as u64)
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
 }
@@ -91,22 +91,22 @@ impl WeightInfo for () {
 	// Storage: MaintenanceMode BlockedCalls (r:1 w:0)
 	// Storage: MaintenanceMode BlockedPallets (r:1 w:0)
 	fn transact() -> Weight {
-		Weight::from_ref_time(209_000_000 as u64)
+		Weight::from_all(209_000_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(5 as u64))
 	}
 	// Storage: Doughnut BlockedDoughnuts (r:0 w:1)
 	fn revoke_doughnut() -> Weight {
-		Weight::from_ref_time(14_000_000 as u64)
+		Weight::from_all(14_000_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Doughnut BlockedHolders (r:0 w:1)
 	fn revoke_holder() -> Weight {
-		Weight::from_ref_time(5_000_000 as u64)
+		Weight::from_all(5_000_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 	// Storage: Doughnut WhitelistedHolders (r:0 w:1)
 	fn update_whitelisted_holders() -> Weight {
-		Weight::from_ref_time(4_000_000 as u64)
+		Weight::from_all(4_000_000 as u64)
 			.saturating_add(RocksDbWeight::get().writes(1 as u64))
 	}
 }

pallet/echo/src/weights.rs

@@ -61,7 +61,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: EthBridge BridgePaused (r:1 w:0)
 	// Storage: System Digest (r:1 w:1)
 	fn ping() -> Weight {
-		Weight::from_ref_time(85_832_000 as u64)
+		Weight::from_all(85_832_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(6 as u64))
 			.saturating_add(T::DbWeight::get().writes(3 as u64))
 	}
@@ -76,7 +76,7 @@ impl WeightInfo for () {
 	// Storage: EthBridge BridgePaused (r:1 w:0)
 	// Storage: System Digest (r:1 w:1)
 	fn ping() -> Weight {
-		Weight::from_ref_time(85_832_000 as u64)
+		Weight::from_all(85_832_000 as u64)
 			.saturating_add(RocksDbWeight::get().reads(6 as u64))
 			.saturating_add(RocksDbWeight::get().writes(3 as u64))
 	}