Revert initial_heap_pages renaming

core/executor/src/native_executor.rs

@@ -75,17 +75,17 @@ pub struct NativeExecutor<D> {
 	/// Native runtime version info.
 	native_version: NativeVersion,
 	/// The number of 64KB pages to allocate for Wasm execution.
-	initial_heap_pages: Option<u64>,
+	default_heap_pages: Option<u64>,
 }
 
 impl<D: NativeExecutionDispatch> NativeExecutor<D> {
 	/// Create new instance.
-	pub fn new(initial_heap_pages: Option<u64>) -> Self {
+	pub fn new(default_heap_pages: Option<u64>) -> Self {
 		NativeExecutor {
 			_dummy: Default::default(),
 			fallback: WasmExecutor::new(),
 			native_version: D::native_version(),
-			initial_heap_pages: initial_heap_pages,
+			default_heap_pages: default_heap_pages,
 		}
 	}
 }
@@ -96,7 +96,7 @@ impl<D: NativeExecutionDispatch> Clone for NativeExecutor<D> {
 			_dummy: Default::default(),
 			fallback: self.fallback.clone(),
 			native_version: D::native_version(),
-			initial_heap_pages: self.initial_heap_pages,
+			default_heap_pages: self.default_heap_pages,
 		}
 	}
 }
@@ -112,7 +112,7 @@ impl<D: NativeExecutionDispatch> RuntimeInfo for NativeExecutor<D> {
 	) -> Option<RuntimeVersion> {
 		RUNTIMES_CACHE.with(|cache| {
 			let cache = &mut cache.borrow_mut();
-			cache.fetch_runtime(&self.fallback, ext, self.initial_heap_pages)
+			cache.fetch_runtime(&self.fallback, ext, self.default_heap_pages)
 				.ok()?.1.clone()
 		})
 	}
@@ -137,7 +137,7 @@ impl<D: NativeExecutionDispatch> CodeExecutor<Blake2Hasher> for NativeExecutor<D
 		RUNTIMES_CACHE.with(|cache| {
 			let cache = &mut cache.borrow_mut();
 			let (module, onchain_version) = match cache.fetch_runtime(
-				&self.fallback, ext, self.initial_heap_pages,
+				&self.fallback, ext, self.default_heap_pages,
 			) {
 				Ok((module, onchain_version)) => (module, onchain_version),
 				Err(e) => return (Err(e), false),

core/executor/src/wasm_runtimes_cache.rs

@@ -196,7 +196,7 @@ impl RuntimesCache {
 	/// up an initial runtime instance. The parameter is only needed for calling
 	/// into the Wasm module to find out the `Core_version`.
 	///
-	/// `initial_heap_pages` - Number of 64KB pages to allocate for Wasm execution.
+	/// `default_heap_pages` - Number of 64KB pages to allocate for Wasm execution.
 	/// Defaults to `DEFAULT_HEAP_PAGES` if `None` is provided.
 	///
 	/// # Return value
@@ -215,7 +215,7 @@ impl RuntimesCache {
 		&mut self,
 		wasm_executor: &WasmExecutor,
 		ext: &mut E,
-		initial_heap_pages: Option<u64>,
+		default_heap_pages: Option<u64>,
 	) -> Result<(WasmModuleInstanceRef, Option<RuntimeVersion>), Error> {
 		let code_hash = ext.original_storage_hash(well_known_keys::CODE).ok_or(Error::InvalidCode)?;
 
@@ -245,7 +245,7 @@ impl RuntimesCache {
 			Entry::Occupied(o) => handle_result(o.get()),
 			Entry::Vacant(v) => {
 				trace!(target: "runtimes_cache", "no instance found in cache, creating now.");
-				let result = Self::create_wasm_instance(wasm_executor, ext, initial_heap_pages);
+				let result = Self::create_wasm_instance(wasm_executor, ext, default_heap_pages);
 				if let Err(ref err) = result {
 					warn!(target: "runtimes_cachce", "cannot create a runtime: {:?}", err);
 				}
@@ -257,7 +257,7 @@ impl RuntimesCache {
 	fn create_wasm_instance<E: Externalities<Blake2Hasher>>(
 		wasm_executor: &WasmExecutor,
 		ext: &mut E,
-		initial_heap_pages: Option<u64>,
+		default_heap_pages: Option<u64>,
 	) -> Result<CachedRuntime, CacheError> {
 		let code = ext
 			.original_storage(well_known_keys::CODE)
@@ -273,7 +273,7 @@ impl RuntimesCache {
 		let heap_pages = ext
 			.storage(well_known_keys::HEAP_PAGES)
 			.and_then(|pages| u64::decode(&mut &pages[..]))
-			.or(initial_heap_pages)
+			.or(default_heap_pages)
 			.unwrap_or(DEFAULT_HEAP_PAGES);
 
 		// Instantiate this module.