From 076529ea550dc7362b695dbc20d04f3c718da9d4 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Mon, 4 Sep 2023 21:33:20 +0200
Subject: [PATCH] Contracts: Update read_sandbox (#1390)
* Update runtime.rs
* Fix
* Revert "Update runtime.rs"
This reverts commit 808f026a835b1f2707f640799454a50fd3a8be7b.
* nit mono-repo fixes
---
substrate/frame/contracts/build.rs | 2 +-
substrate/frame/contracts/src/tests.rs | 4 +++-
substrate/frame/contracts/src/wasm/runtime.rs | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/substrate/frame/contracts/build.rs b/substrate/frame/contracts/build.rs
index 7817ace9c98..42bc45d563d 100644
--- a/substrate/frame/contracts/build.rs
+++ b/substrate/frame/contracts/build.rs
@@ -53,7 +53,7 @@ fn get_latest_version() -> u16 {
fn main() -> Result<(), Box<dyn std::error::Error>> {
let out_dir = std::env::var("OUT_DIR")?;
let path = std::path::Path::new(&out_dir).join("migration_codegen.rs");
- let mut f = std::fs::File::create(&path)?;
+ let mut f = std::fs::File::create(path)?;
let version = get_latest_version();
write!(
f,
diff --git a/substrate/frame/contracts/src/tests.rs b/substrate/frame/contracts/src/tests.rs
index 0c0a2f7f932..8d6c5c5ac72 100644
--- a/substrate/frame/contracts/src/tests.rs
+++ b/substrate/frame/contracts/src/tests.rs
@@ -564,7 +564,9 @@ where
{
let fixture_path = [
// When `CARGO_MANIFEST_DIR` is not set, Rust resolves relative paths from the root folder
- std::env::var("CARGO_MANIFEST_DIR").as_deref().unwrap_or("frame/contracts"),
+ std::env::var("CARGO_MANIFEST_DIR")
+ .as_deref()
+ .unwrap_or("substrate/frame/contracts"),
"/fixtures/",
fixture_name,
".wat",
diff --git a/substrate/frame/contracts/src/wasm/runtime.rs b/substrate/frame/contracts/src/wasm/runtime.rs
index 4bc00388f72..4fd52b471a0 100644
--- a/substrate/frame/contracts/src/wasm/runtime.rs
+++ b/substrate/frame/contracts/src/wasm/runtime.rs
@@ -608,7 +608,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
let mut bound_checked = memory
.get(ptr..ptr + D::max_encoded_len() as usize)
.ok_or_else(|| Error::<E::T>::OutOfBounds)?;
- let decoded = D::decode_all_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
+ let decoded = D::decode_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
Ok(decoded)
}
--
GitLab