#9386: copy rustfmt.toml to node-template (#9461)

* copying rustfmt from root to node-template build. Also, running rustfmt on this. * Update .maintain/node-template-release/src/main.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Add some important events to batch & staking to ensure ease of analysis (#9462) * Add some important events to batch & staking to ensure ease of analysis * Update frame/staking/src/pallet/mod.rs Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com> * Update lib.rs * fix test Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> * Move client consensus parts out of primitives and into client/consensus/api (#9319) * moved client code out of primitives * bump ci * Fixup from merge. * Removed unused deps thanks to review feedback * Removing unneeded deps * updating lock file * note about rustfmt * fixed typo to bump ci * Move lonely CacheKeyId to parent * cargo fmt * updating import style * Update docs/STYLE_GUIDE.md Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Refactor Benchmarks for Less Wasm Memory Usage (#9373) * extract repeat out of benchmark * remove r * unused * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * use linked map to keep order * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Delete pallet_balances.rs * Delete out * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * steps and repeat to tuple (current_*, total_*) * idea for list command * fmt * use benchmark list in cli * handle steps in cli * move log update to cli * fmt * remove old todo * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * benchmark metadata function * don't need this warm up * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix warnings * fix node-template * fix * fmt * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * improve docs * improve cli * fix format * fix bug? * Revert "fix bug?" This reverts commit 8051bf1bf9bae862ff28dfff386e7045cd3f045e. * skip frame-metadata * extract repeat out of benchmark * remove r * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * use linked map to keep order * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Delete pallet_balances.rs * Delete out * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * steps and repeat to tuple (current_*, total_*) * idea for list command * fmt * use benchmark list in cli * handle steps in cli * move log update to cli * remove old todo * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * benchmark metadata function * don't need this warm up * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix warnings * fix node-template * fix * fmt * line width * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs * improve docs * improve cli * fix format * fix bug? * Revert "fix bug?" This reverts commit 8051bf1bf9bae862ff28dfff386e7045cd3f045e. * skip frame-metadata * Update .gitlab-ci.yml * fix import * Update .gitlab-ci.yml Co-authored-by: Parity Benchmarking Bot <admin@parity.io> * Warp sync part I (#9227) * Started warp sync * BABE & GRANDPA recovery * Warp sync protocol * Sync warp proofs first * Added basic documentation * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Style changes * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * fmt * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Fixed chage trie pruning wrt missing blocks * Restore parent finalization * fmt * fmt * Revert pwasm-utils bump * Change error type & check API version * Apply suggestions from code review Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Build fix * Fixed target block check * Formatting Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Add rustfmt skip to default frame benchmarking template (#9473) This was missed in the introduction pr of rustfmt. There we only had updated the Substrate local template. * CI: stop publishing to crates.io until unleash is fixed (#9474) * CI: stop publishing to crates.io until unleash is fixed; allow restarting k8s runners * CI: fix CI if ci-release tag is pushed Co-authored-by: Eric Miller <emiller@lirio.co> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Gavin Wood <gavin@parity.io> Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Squirrel <gilescope@gmail.com> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: Parity Benchmarking Bot <admin@parity.io> Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com> Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
2026-06-11 16:31:07 +00:00 · 2021-08-02 17:46:53 -04:00
parent 92b8e0680c
commit 28c76a1de4
1 changed files with 73 additions and 46 deletions
@@ -1,8 +1,11 @@
 use structopt::StructOpt;

 use std::{
-	path::{PathBuf, Path}, collections::HashMap, fs::{File, OpenOptions, self}, io::{Read, Write},
-	process::Command
+	collections::HashMap,
+	fs::{self, File, OpenOptions},
+	io::{Read, Write},
+	path::{Path, PathBuf},
+	process::Command,
 };

 use glob;
@@ -40,11 +43,9 @@ fn find_cargo_tomls(path: PathBuf) -> Vec<PathBuf> {
 	let glob = glob::glob(&path).expect("Generates globbing pattern");

 	let mut result = Vec::new();
-	glob.into_iter().for_each(|file| {
-		match file {
-			Ok(file) => result.push(file),
-			Err(e) => println!("{:?}", e),
-		}
+	glob.into_iter().for_each(|file| match file {
+		Ok(file) => result.push(file),
+		Err(e) => println!("{:?}", e),
 	});

 	if result.is_empty() {
@@ -78,30 +79,44 @@ fn get_git_commit_id(path: &Path) -> String {
 /// Parse the given `Cargo.toml` into a `HashMap`
 fn parse_cargo_toml(file: &Path) -> CargoToml {
 	let mut content = String::new();
-	File::open(file).expect("Cargo.toml exists").read_to_string(&mut content).expect("Reads file");
+	File::open(file)
+		.expect("Cargo.toml exists")
+		.read_to_string(&mut content)
+		.expect("Reads file");
 	toml::from_str(&content).expect("Cargo.toml is a valid toml file")
 }

 /// Replaces all substrate path dependencies with a git dependency.
-fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, cargo_toml: &mut CargoToml) {
+fn replace_path_dependencies_with_git(
+	cargo_toml_path: &Path,
+	commit_id: &str,
+	cargo_toml: &mut CargoToml,
+) {
 	let mut cargo_toml_path = cargo_toml_path.to_path_buf();
 	// remove `Cargo.toml`
 	cargo_toml_path.pop();

 	for &table in &["dependencies", "build-dependencies", "dev-dependencies"] {
-		let mut dependencies: toml::value::Table = match cargo_toml
-			.remove(table)
-			.and_then(|v| v.try_into().ok()) {
-			Some(deps) => deps,
-			None => continue,
-		};
+		let mut dependencies: toml::value::Table =
+			match cargo_toml.remove(table).and_then(|v| v.try_into().ok()) {
+				Some(deps) => deps,
+				None => continue,
+			};

 		let deps_rewritten = dependencies
 			.iter()
-			.filter_map(|(k, v)| v.clone().try_into::<toml::value::Table>().ok().map(move |v| (k, v)))
-			.filter(|t| t.1.contains_key("path") && {
-				// if the path does not exists, we need to add this as git dependency
-				t.1.get("path").unwrap().as_str().map(|path| !cargo_toml_path.join(path).exists()).unwrap_or(false)
+			.filter_map(|(k, v)| {
+				v.clone().try_into::<toml::value::Table>().ok().map(move |v| (k, v))
+			})
+			.filter(|t| {
+				t.1.contains_key("path") && {
+					// if the path does not exists, we need to add this as git dependency
+					t.1.get("path")
+						.unwrap()
+						.as_str()
+						.map(|path| !cargo_toml_path.join(path).exists())
+						.unwrap_or(false)
+				}
 			})
 			.map(|(k, mut v)| {
 				// remove `path` and add `git` and `rev`
@@ -110,7 +125,8 @@ fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, c
 				v.insert("rev".into(), commit_id.into());

 				(k.clone(), v.into())
-			}).collect::<HashMap<_, _>>();
+			})
+			.collect::<HashMap<_, _>>();

 		dependencies.extend(deps_rewritten.into_iter());

@@ -135,8 +151,9 @@ fn update_top_level_cargo_toml(

 	cargo_toml.insert("profile".into(), profile.into());

-	let members = workspace_members.iter()
-		.map(|p|
+	let members = workspace_members
+		.iter()
+		.map(|p| {
 			p.strip_prefix(node_template_path)
 				.expect("Workspace member is a child of the node template path!")
 				.parent()
@@ -145,7 +162,7 @@ fn update_top_level_cargo_toml(
 				.expect("The given path ends with `Cargo.toml` as file name!")
 				.display()
 				.to_string()
-		)
+		})
 		.collect::<Vec<_>>();

 	let mut members_section = toml::value::Table::new();
@@ -163,24 +180,20 @@ fn write_cargo_toml(path: &Path, cargo_toml: CargoToml) {
 /// Build and test the generated node-template
 fn build_and_test(path: &Path, cargo_tomls: &[PathBuf]) {
 	// Build node
-	assert!(
-		Command::new("cargo")
-			.args(&["build", "--all"])
-			.current_dir(path)
-			.status()
-			.expect("Compiles node")
-			.success()
-	);
+	assert!(Command::new("cargo")
+		.args(&["build", "--all"])
+		.current_dir(path)
+		.status()
+		.expect("Compiles node")
+		.success());

 	// Test node
-	assert!(
-		Command::new("cargo")
-			.args(&["test", "--all"])
-			.current_dir(path)
-			.status()
-			.expect("Tests node")
-			.success()
-	);
+	assert!(Command::new("cargo")
+		.args(&["test", "--all"])
+		.current_dir(path)
+		.status()
+		.expect("Tests node")
+		.success());

 	// Remove all `target` directories
 	for toml in cargo_tomls {
@@ -189,7 +202,8 @@ fn build_and_test(path: &Path, cargo_tomls: &[PathBuf]) {
 		target_path = target_path.join("target");

 		if target_path.exists() {
-			fs::remove_dir_all(&target_path).expect(&format!("Removes `{}`", target_path.display()));
+			fs::remove_dir_all(&target_path)
+				.expect(&format!("Removes `{}`", target_path.display()));
 		}
 	}
 }
@@ -219,7 +233,10 @@ fn main() {
 	// Check if top level Cargo.toml exists. If not, create one in the destination
 	if !cargo_tomls.contains(&top_level_cargo_toml_path) {
 		// create the top_level_cargo_toml
-		OpenOptions::new().create(true).write(true).open(top_level_cargo_toml_path.clone())
+		OpenOptions::new()
+			.create(true)
+			.write(true)
+			.open(top_level_cargo_toml_path.clone())
 			.expect("Create root level `Cargo.toml` failed.");

 		// push into our data structure
@@ -233,9 +250,8 @@ fn main() {
 		// Check if this is the top level `Cargo.toml`, as this requires some special treatments.
 		if top_level_cargo_toml_path == *t {
 			// All workspace member `Cargo.toml` file paths.
-			let workspace_members = cargo_tomls.iter()
-				.filter(|p| **p != top_level_cargo_toml_path)
-				.collect();
+			let workspace_members =
+				cargo_tomls.iter().filter(|p| **p != top_level_cargo_toml_path).collect();

 			update_top_level_cargo_toml(&mut cargo_toml, workspace_members, &node_template_path);
 		}
@@ -243,10 +259,21 @@ fn main() {
 		write_cargo_toml(&t, cargo_toml);
 	});

+	// adding root rustfmt to node template build path
+	let node_template_rustfmt_toml_path = node_template_path.join("rustfmt.toml");
+	let root_rustfmt_toml =
+		&options.node_template.join("../../rustfmt.toml");
+	if root_rustfmt_toml.exists() {
+		fs::copy(&root_rustfmt_toml, &node_template_rustfmt_toml_path)
+			.expect("Copying rustfmt.toml.");
+	}
+
 	build_and_test(&node_template_path, &cargo_tomls);

-	let output = GzEncoder::new(File::create(&options.output)
-		.expect("Creates output file"), Compression::default());
+	let output = GzEncoder::new(
+		File::create(&options.output).expect("Creates output file"),
+		Compression::default(),
+	);
 	let mut tar = tar::Builder::new(output);
 	tar.append_dir_all("substrate-node-template", node_template_path)
 		.expect("Writes substrate-node-template archive");