mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-11-16 23:57:06 +00:00
Contracts move fixtures to new crate (#2246)
Small PR that introduce a new crate that will host RISC-V & wasm fixtures for testing pallet-contracts
This commit is contained in:
1 parent
03ee44d9e1
commit
64effd0e6f
57 files changed
+74
-23
No files matched your search
Generated
+10
@@ -9701,6 +9701,7 @@ dependencies = [
|
||||
"impl-trait-for-tuples",
|
||||
"log",
|
||||
"pallet-balances",
|
||||
"pallet-contracts-fixtures",
|
||||
"pallet-contracts-primitives",
|
||||
"pallet-contracts-proc-macro",
|
||||
"pallet-insecure-randomness-collective-flip",
|
||||
@@ -9725,6 +9726,15 @@ dependencies = [
|
||||
"wat",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pallet-contracts-fixtures"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"frame-system",
|
||||
"sp-runtime",
|
||||
"wat",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pallet-contracts-primitives"
|
||||
version = "24.0.0"
|
||||
|
||||
@@ -293,6 +293,7 @@ members = [
|
||||
"substrate/frame/child-bounties",
|
||||
"substrate/frame/collective",
|
||||
"substrate/frame/contracts",
|
||||
"substrate/frame/contracts/fixtures",
|
||||
"substrate/frame/contracts/primitives",
|
||||
"substrate/frame/contracts/proc-macro",
|
||||
"substrate/frame/conviction-voting",
|
||||
|
||||
@@ -54,6 +54,7 @@ assert_matches = "1"
|
||||
env_logger = "0.9"
|
||||
pretty_assertions = "1"
|
||||
wat = "1"
|
||||
pallet-contracts-fixtures = { path = "./fixtures" }
|
||||
|
||||
# Substrate Dependencies
|
||||
pallet-balances = { path = "../balances" }
|
||||
@@ -73,6 +74,7 @@ std = [
|
||||
"frame-system/std",
|
||||
"log/std",
|
||||
"pallet-balances?/std",
|
||||
"pallet-contracts-fixtures/std",
|
||||
"pallet-contracts-primitives/std",
|
||||
"pallet-contracts-proc-macro/full",
|
||||
"pallet-insecure-randomness-collective-flip/std",
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
[package]
|
||||
name = "pallet-contracts-fixtures"
|
||||
publish = false
|
||||
version = "1.0.0"
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
description = "Fixtures for testing contracts pallet."
|
||||
|
||||
[dependencies]
|
||||
wat = "1"
|
||||
frame-system = { path = "../../system", default-features = false}
|
||||
sp-runtime = { path = "../../../primitives/runtime", default-features = false}
|
||||
|
||||
[features]
|
||||
default = [ "std" ]
|
||||
std = [ "frame-system/std", "sp-runtime/std" ]
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,42 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use sp_runtime::traits::Hash;
|
||||
use std::{env::var, path::PathBuf};
|
||||
|
||||
fn fixtures_root_dir() -> PathBuf {
|
||||
match (var("CARGO_MANIFEST_DIR"), var("CARGO_PKG_NAME")) {
|
||||
// When `CARGO_MANIFEST_DIR` is not set, Rust resolves relative paths from the root folder
|
||||
(Err(_), _) => "substrate/frame/contracts/fixtures/data".into(),
|
||||
(Ok(path), Ok(s)) if s == "pallet-contracts" => PathBuf::from(path).join("fixtures/data"),
|
||||
(Ok(_), pkg_name) => panic!("Failed to resolve fixture dir for tests from {pkg_name:?}."),
|
||||
}
|
||||
}
|
||||
|
||||
/// Load a given wasm module represented by a .wat file and returns a wasm binary contents along
|
||||
/// with it's hash.
|
||||
///
|
||||
/// The fixture files are located under the `fixtures/` directory.
|
||||
pub fn compile_module<T>(fixture_name: &str) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
|
||||
where
|
||||
T: frame_system::Config,
|
||||
{
|
||||
let fixture_path = fixtures_root_dir().join(format!("{fixture_name}.wat"));
|
||||
let wasm_binary = wat::parse_file(fixture_path)?;
|
||||
let code_hash = T::Hashing::hash(&wasm_binary);
|
||||
Ok((wasm_binary, code_hash))
|
||||
}
|
||||
@@ -53,6 +53,7 @@ use frame_support::{
|
||||
weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},
|
||||
};
|
||||
use frame_system::{EventRecord, Phase};
|
||||
use pallet_contracts_fixtures::compile_module;
|
||||
use pallet_contracts_primitives::CodeUploadReturnValue;
|
||||
use pretty_assertions::{assert_eq, assert_ne};
|
||||
use sp_core::ByteArray;
|
||||
@@ -555,29 +556,6 @@ impl ExtBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
/// Load a given wasm module represented by a .wat file and returns a wasm binary contents along
|
||||
/// with it's hash.
|
||||
///
|
||||
/// The fixture files are located under the `fixtures/` directory.
|
||||
fn compile_module<T>(fixture_name: &str) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
|
||||
where
|
||||
T: frame_system::Config,
|
||||
{
|
||||
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("substrate/frame/contracts"),
|
||||
"/fixtures/",
|
||||
fixture_name,
|
||||
".wat",
|
||||
]
|
||||
.concat();
|
||||
let wasm_binary = wat::parse_file(fixture_path)?;
|
||||
let code_hash = T::Hashing::hash(&wasm_binary);
|
||||
Ok((wasm_binary, code_hash))
|
||||
}
|
||||
|
||||
fn initialize_block(number: u64) {
|
||||
System::reset_events();
|
||||
System::initialize(&number, &[0u8; 32].into(), &Default::default());
|
||||
|
||||
Reference in new issue
Block a user