max_runtime_mem to Schedule limits

frame/contracts/src/lib.rs

@@ -353,8 +353,8 @@ pub mod pallet {
 		}
 
 		fn integrity_test() {
-			// Total runtime memory is expected to have 128Mb upper limit
-			const MAX_RUNTIME_MEM: u32 = 1024 * 1024 * 128;
+			// Total runtime memory limit
+			let max_runtime_mem: u32 = T::Schedule::get().limits.runtime_memory;
 			// Memory limits for a single contract:
 			// Value stack size: 1Mb per contract, default defined in wasmi
 			const MAX_STACK_SIZE: u32 = 1024 * 1024;
@@ -388,10 +388,10 @@ pub mod pallet {
 			// This gives us the following formula:
 			//
 			// `(MaxCodeLen * 18 * 4 + MAX_STACK_SIZE + max_heap_size) * max_call_depth <
-			// MAX_RUNTIME_MEM/2`
+			// max_runtime_mem/2`
 			//
 			// Hence the upper limit for the `MaxCodeLen` can be defined as follows:
-			let code_len_limit = MAX_RUNTIME_MEM
+			let code_len_limit = max_runtime_mem
 				.saturating_div(2)
 				.saturating_div(max_call_depth)
 				.saturating_sub(max_heap_size)

frame/contracts/src/schedule.rs

@@ -127,6 +127,10 @@ pub struct Limits {
 
 	/// The maximum size of a storage value and event payload in bytes.
 	pub payload_len: u32,
+
+	/// The maximum node runtime memory. This is for integrity checks only and does not affect the
+	/// real setting.
+	pub runtime_memory: u32,
 }
 
 impl Limits {
@@ -473,6 +477,7 @@ impl Default for Limits {
 			br_table_size: 256,
 			subject_len: 32,
 			payload_len: 16 * 1024,
+			runtime_memory: 1024 * 1024 * 128,
 		}
 	}
 }

frame/contracts/src/tests.rs

@@ -344,8 +344,8 @@ parameter_types! {
 	};
 	pub static DepositPerByte: BalanceOf<Test> = 1;
 	pub const DepositPerItem: BalanceOf<Test> = 2;
-	// We set it to maximum for running benchmarks
-	pub const DefaultDepositLimit: BalanceOf<Test> = Balance::max_value();
+	// We need this one set high enough for running benchmarks.
+	pub const DefaultDepositLimit: BalanceOf<Test> = 10_000_000;
 }
 
 impl Convert<Weight, BalanceOf<Self>> for Test {
@@ -4190,7 +4190,7 @@ fn deposit_limit_in_nested_instantiate() {
 
 		let callee_info_len = ContractInfoOf::<Test>::get(&addr).unwrap().encoded_size() as u64;
 
-		// We don't set a special deposit limit for the netsted instantiation.
+		// We don't set a special deposit limit for the nested instantiation.
 		//
 		// The deposit limit set for the parent is insufficient for the instantiation, which
 		// requires: