Merge branch 'master' into na-sgx-hello-world

* master: pallet-contracts: migrate to nested storage transaction mechanism (#6382)
paritytech · Jun 24, 2020 · a1d4fd6 · a1d4fd6
2 parents 59eca64 + 9a9b248
commit a1d4fd6
Show file tree

Hide file tree

Showing 11 changed files with 661 additions and 936 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/contracts/Cargo.toml b/frame/contracts/Cargo.toml
@@ -31,6 +31,7 @@ pallet-transaction-payment = { version = "2.0.0-rc3", default-features = false,
 wabt = "0.9.2"
 assert_matches = "1.3.0"
 hex-literal = "0.2.1"
+pretty_assertions = "0.6.1"
 pallet-balances = { version = "2.0.0-rc3", path = "../balances" }
 pallet-timestamp = { version = "2.0.0-rc3", path = "../timestamp" }
 pallet-randomness-collective-flip = { version = "2.0.0-rc3", path = "../randomness-collective-flip" }

diff --git a/frame/contracts/fixtures/restoration.wat b/frame/contracts/fixtures/restoration.wat
@@ -1,6 +1,10 @@
 (module
 	(import "env" "ext_set_storage" (func $ext_set_storage (param i32 i32 i32)))
-	(import "env" "ext_restore_to" (func $ext_restore_to (param i32 i32 i32 i32 i32 i32 i32 i32)))
+	(import "env" "ext_restore_to"
+		(func $ext_restore_to
+			(param i32 i32 i32 i32 i32 i32 i32 i32)
+		)
+	)
 	(import "env" "memory" (memory 1 1))
 
 	(func (export "call")