improve fmt and lint config

Signed-off-by: Jun Kimura <[email protected]>
hyperledger-labs · May 16, 2024 · 312d14e · 312d14e
1 parent a9f6521
commit 312d14e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.solhintignore b/.solhintignore
@@ -1,2 +1 @@
 contracts/proto
-tests/foundry
diff --git a/Makefile b/Makefile
@@ -14,16 +14,11 @@ build:
 
 .PHONY: fmt
 fmt:
-	@$(FORGE) fmt $(FORGE_FMT_OPTS) \
-		./contracts/apps \
-		./contracts/clients \
-		./contracts/core \
-		./contracts/helpers \
-		./tests/foundry/src
+	@$(FORGE) fmt $(FORGE_FMT_OPTS)
 
 .PHONY: lint
 lint:
-	@npx solhint 'contracts/{apps,clients,core}/**/*.sol' 'tests/foundry/src/**/*.sol'
+	@npx solhint 'contracts/**/*.sol'
 	@$(MAKE) FORGE_FMT_OPTS=--check fmt
 
 .PHONY: test

diff --git a/foundry.toml b/foundry.toml
@@ -7,5 +7,11 @@ gas_reports = ["*"]
 optimizer = true
 optimizer_runs = 9_999_999
 
+[fmt]
+ignore = [
+  './contracts/proto/**/*.sol',
+  './tests/**/*.sol'
+]
+
 [profile.no_optimization]
 optimizer = false