Auto-enforce code formatting (#590)

Manta-Network · Jun 20, 2022 · 65357c5 · 65357c5
1 parent b5e449b
commit 65357c5
Show file tree

Hide file tree

Showing 139 changed files with 23,771 additions and 23,734 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,21 +3,28 @@ root = true
 [*.rs]
 charset=utf-8
 end_of_line=lf
-indent_size=space
+indent_size=4
 indent_style=space
 insert_final_newline=true
 max_line_length=100
-tab_width=4
+trim_trailing_whitespace=true
+
+[*.toml]
+end_of_line=lf
+indent_size=2
+indent_style=space
+trim_trailing_whitespace=true
+
+[*.md]
+insert_final_newline=true
 trim_trailing_whitespace=true
 
 [*.yml]
 end_of_line=lf
 indent_size=2
 indent_style=space
-tab_width=8
 
 [*.sh]
 end_of_line=lf
 indent_size=2
 indent_style=space
-tab_width=8
diff --git a/.github/resources/frame-weight-template.hbs b/.github/resources/frame-weight-template.hbs
@@ -1,16 +1,16 @@
 // Copyright 2020-2022 Manta Network.
 // This file is part of Manta.
-
+//
 // Manta is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-
+//
 // Manta is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with Manta.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -34,76 +34,76 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for {{pallet}}.
 pub trait WeightInfo {
-	{{#each benchmarks as |benchmark|}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{c.name}}: u32, {{/each~}}
-	) -> Weight;
-	{{/each}}
+    {{#each benchmarks as |benchmark|}}
+    fn {{benchmark.name~}}
+    (
+        {{~#each benchmark.components as |c| ~}}
+        {{c.name}}: u32, {{/each~}}
+    ) -> Weight;
+    {{/each}}
 }
 
 /// Weights for {{pallet}} using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> {{pallet}}::WeightInfo for SubstrateWeight<T> {
-	{{#each benchmarks as |benchmark|}}
-	{{#each benchmark.comments as |comment|}}
-	// {{comment}}
-	{{/each}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
-	) -> Weight {
-		({{underscore benchmark.base_weight}} as Weight)
-			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{underscore cw.error}}
-			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
-			{{/each}}
-			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
-			{{/if}}
-			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
-			{{/each}}
-			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
-			{{/if}}
-			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
-			{{/each}}
-	}
-	{{/each}}
+    {{#each benchmarks as |benchmark|}}
+    {{#each benchmark.comments as |comment|}}
+    // {{comment}}
+    {{/each}}
+    fn {{benchmark.name~}}
+    (
+        {{~#each benchmark.components as |c| ~}}
+        {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+    ) -> Weight {
+        ({{underscore benchmark.base_weight}} as Weight)
+            {{#each benchmark.component_weight as |cw|}}
+            // Standard Error: {{underscore cw.error}}
+            .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+            {{/each}}
+            {{#if (ne benchmark.base_reads "0")}}
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+            {{/if}}
+            {{#each benchmark.component_reads as |cr|}}
+            .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+            {{/each}}
+            {{#if (ne benchmark.base_writes "0")}}
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+            {{/if}}
+            {{#each benchmark.component_writes as |cw|}}
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+            {{/each}}
+    }
+    {{/each}}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	{{#each benchmarks as |benchmark|}}
-	{{#each benchmark.comments as |comment|}}
-	// {{comment}}
-	{{/each}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
-	) -> Weight {
-		({{underscore benchmark.base_weight}} as Weight)
-			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{underscore cw.error}}
-			.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
-			{{/each}}
-			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
-			{{/if}}
-			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
-			{{/each}}
-			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
-			{{/if}}
-			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
-			{{/each}}
-	}
-	{{/each}}
+    {{#each benchmarks as |benchmark|}}
+    {{#each benchmark.comments as |comment|}}
+    // {{comment}}
+    {{/each}}
+    fn {{benchmark.name~}}
+    (
+        {{~#each benchmark.components as |c| ~}}
+        {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+    ) -> Weight {
+        ({{underscore benchmark.base_weight}} as Weight)
+            {{#each benchmark.component_weight as |cw|}}
+            // Standard Error: {{underscore cw.error}}
+            .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+            {{/each}}
+            {{#if (ne benchmark.base_reads "0")}}
+            .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
+            {{/if}}
+            {{#each benchmark.component_reads as |cr|}}
+            .saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+            {{/each}}
+            {{#if (ne benchmark.base_writes "0")}}
+            .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
+            {{/if}}
+            {{#each benchmark.component_writes as |cw|}}
+            .saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+            {{/each}}
+    }
+    {{/each}}
 }
diff --git a/.github/workflows/check_build.yml b/.github/workflows/check_build.yml
@@ -83,25 +83,26 @@ jobs:
         run: |
           curl -s https://sh.rustup.rs -sSf | sh -s -- -y
           source ${HOME}/.cargo/env
-          rustup toolchain install stable
           rustup toolchain install nightly
-          rustup default stable
           rustup target add wasm32-unknown-unknown --toolchain nightly
+          rustup default nightly
           rustup update
+          cargo install taplo-cli
       -
         name: Run yamllint
         uses: actionshub/yamllint@main
       -
-        name: Check Clippy & Formatting
+        name: Check Formatting
         env:
           RUST_BACKTRACE: full
           RUSTC_WRAPPER: sccache
           SCCACHE_CACHE_SIZE: 2G
           SCCACHE_DIR: /home/runner/.cache/sccache
         run: |
           source ${HOME}/.cargo/env
-          SKIP_WASM_BUILD=1 cargo clippy
-          SKIP_WASM_BUILD=1 cargo fmt
+          cargo fmt --all -- --check
+          $HOME/.cargo/bin/taplo fmt --check
+          $HOME/.cargo/bin/taplo lint
       -
         name: Check Build
         env:
@@ -111,8 +112,8 @@ jobs:
           SCCACHE_DIR: /home/runner/.cache/sccache
         run: |
           source ${HOME}/.cargo/env
-          cargo check --no-default-features
-          cargo check --all-features
+          SKIP_WASM_BUILD=1 cargo check --no-default-features
+          SKIP_WASM_BUILD=1 cargo clippy --all-targets --all-features -- -D warnings
       -
         name: stop sccache server
         run: sccache --stop-server || true

diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1,2 +1,3 @@
-hard_tabs=true
-imports_granularity="Crate"
+edition = '2021'                        # Needed for direct invocation of rustfmt ourside of cargo fmt
+imports_granularity = "Crate"
+license_template_path = "FILE_TEMPLATE"
diff --git a/.taplo.toml b/.taplo.toml
@@ -0,0 +1,4 @@
+[formatting]
+array_auto_collapse = false
+array_auto_expand = false
+reorder_keys = true
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,18 +1,18 @@
 [workspace]
-resolver = "2"
 members = [
-	'node',
-	'pallets/*',
-	'runtime/manta',
-	'runtime/calamari',
-	'runtime/dolphin',
-	'runtime/common',
-	'primitives',
+  'node',
+  'pallets/*',
+  'runtime/manta',
+  'runtime/calamari',
+  'runtime/dolphin',
+  'runtime/common',
+  'primitives',
 ]
+resolver = "2"
 
 [profile.production]
-inherits = "release"
 codegen-units = 1
+inherits = "release"
 lto = true
 
 [profile.release]

diff --git a/file_header.txt → FILE_TEMPLATE b/file_header.txt → FILE_TEMPLATE