Revert ci changes (#292)

* Revert "Readd pre-commit hook (#290)"

This reverts commit 43bd287.

* Revert "Improve ci config (#287)"

This reverts commit 87ba942.

Author: cprussin

.envrc

@@ -0,0 +1,22 @@
+name: JS/TS checks
+on:
+  pull_request:
+  push:
+    branches: [main]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "npm"
+      - name: Install deps
+        run: npm ci
+      - name: Lint
+        run: npm run lint
+      - name: Test
+        run: npm run test
+      - name: Build
+        run: npm run build

.github/workflows/js-checks.yaml

@@ -0,0 +1,14 @@
+name: Pre-commit checks
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/[email protected]

.github/workflows/pre-commit.yml

@@ -9,4 +9,3 @@ node_modules
 
 .DS_Store
 .env.local
-tsconfig.tsbuildinfo

.github/workflows/test.yaml

@@ -1,7 +1,18 @@
 repos:
-  - repo: local
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
     hooks:
-      - id: check-prettier
-        name: Check Prettier
-        entry: npm run test:format --
-        language: system
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-added-large-files
+        args: ["--maxkb=3000"]
+        exclude: package-lock.json
+  # Hook to format many type of files in the repo
+  # including solidity contracts.
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v2.7.1"
+    hooks:
+      - id: prettier
+        additional_dependencies:
+          - "[email protected]"
+          - "[email protected]"

.gitignore

@@ -72,7 +72,7 @@ function wrapSolCode(code: string): string {
 async function runCodeSnippet(
   code: string,
   language: string,
-  id: string,
+  id: string
 ): Promise<[boolean, string]> {
   if (language === "typescript") {
     const tempFilePath = join(codeSnippetsDir, `${id}.ts`);
@@ -94,7 +94,7 @@ async function runCodeSnippet(
     fs.writeFileSync(
       join(tempFilePath, "Cargo.toml"),
       generateCargoText(),
-      "utf8",
+      "utf8"
     );
     // cargo check checks syntax without doing a full build. It's faster (but still pretty slow)
     const command = `cd ${tempFilePath} && cargo check`;
@@ -132,7 +132,7 @@ path = "lib.rs"
 }
 
 async function runValidationCommand(
-  command: string,
+  command: string
 ): Promise<[boolean, string]> {
   try {
     const result = await execPromise(command);
@@ -143,21 +143,12 @@ async function runValidationCommand(
   }
 }
 
-async function runValidationFunction(
-  input: string,
-  f: (arg: string) => void,
-): Promise<[boolean, string]> {
+async function runValidationFunction(input: string, f: (string) => void) {
   try {
     f(input);
     return [true, input];
   } catch (error) {
-    if (typeof error === "string") {
-      return [false, error];
-    } else if (error instanceof Error) {
-      return [false, error.toString()];
-    } else {
-      return [false, "unknown error"];
-    }
+    return [false, error.toString()];
   }
 }
 

.nvmrc

@@ -20,7 +20,7 @@ const ContractInfo = () => {
         setIsLoading(true);
         setFee((await pythContract.getUpdateFee(["0x01"])).toString());
         setValidTimePeriod(
-          (await pythContract.getValidTimePeriod()).toString(),
+          (await pythContract.getValidTimePeriod()).toString()
         );
         setIsLoading(false);
       } catch (error: any) {

.pre-commit-config.yaml

@@ -81,7 +81,7 @@ const CosmWasmExecute = ({ buildMsg, feeKey }: CosmWasmExecuteProps) => {
 
     if (msgJson === undefined || funds === undefined) {
       setResponsePreface(
-        `Please populate all of the arguments with valid values.`,
+        `Please populate all of the arguments with valid values.`
       );
       setResponse(undefined);
     } else {