chore: minor build fixes

removed kustomize from deps, moved sudo command to the top in qemu test, removed IERC20 from ts-gen-abi causing wagmi generate to fail
comrade-coop · May 20, 2024 · 9d8eec3 · 9d8eec3
1 parent 65722a0
commit 9d8eec3
Show file tree

Hide file tree

Showing 9 changed files with 795 additions and 752 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/pkg/abi-ts/generated.ts b/pkg/abi-ts/generated.ts
diff --git a/pkg/abi-ts/package.json b/pkg/abi-ts/package.json
@@ -6,7 +6,7 @@
     "ts-gen-abi": "wagmi generate",
     "generate": "npm run gen-abi"
   },
-  "devDependencies": {
-    "@wagmi/cli": "^1.5.2"
+  "dependencies": {
+    "@wagmi/cli": "^2.1.7"
   }
 }
diff --git a/pkg/abi-ts/wagmi.config.ts b/pkg/abi-ts/wagmi.config.ts
@@ -12,11 +12,7 @@ export default defineConfig({
       forge: {
         build: false
       },
-      include: [
-        'Payment.json',
-        'IERC20.json',
-        'MockToken.json'
-      ]
+      include: ['Payment.json', 'MockToken.json']
     })
   ]
 })
diff --git a/test/e2e/constellation/miniconstellation/run-test.sh b/test/e2e/constellation/miniconstellation/run-test.sh
@@ -12,7 +12,7 @@ which go >/dev/null
 which ipfs >/dev/null
 which forge &>/dev/null || export PATH=$PATH:~/.bin/foundry
 which forge >/dev/null; which cast >/dev/null
-which helmfile >/dev/null; which helm >/dev/null; which kustomize >/dev/null; which kubectl >/dev/null
+which helmfile >/dev/null; which helm >/dev/null; which kubectl >/dev/null
 which constellation >/dev/null || { echo "Install Constellation, https://docs.edgeless.systems/constellation/getting-started/first-steps-local#software-installation-on-ubuntu"; exit 1; }
 
 CONSTELLATION_PATH=${CONSTELLATION_PATH:-~/.constellation-root}

diff --git a/test/e2e/constellation/qemu/build.sh b/test/e2e/constellation/qemu/build.sh
@@ -25,6 +25,8 @@ if [ "$1" = "teardown" ]; then
    exit 0
 fi
 
+sudo chmod o+rw /run/containerd/containerd.sock
+
 ## 0: Generate helm template and inject it into constellation base image
 helmfile template -f "$CHART_PATH" > "$CONSTELLATION_PATH/image/base/mkosi.skeleton/usr/lib/helmfile-template"
 

diff --git a/test/e2e/constellation/qemu/run-test.sh b/test/e2e/constellation/qemu/run-test.sh
@@ -114,10 +114,6 @@ FUNDS=10000000000000000000000
 set +v
 set -x
 
-
-sudo chmod o+rw /run/containerd/containerd.sock
-
-
 go run ../../../../cmd/trustedpods/ pod deploy ../../common/manifest-nginx.yaml \
   --ethereum-key "$PUBLISHER_KEY" \
   --payment-contract "$PAYMENT_CONTRACT" \

diff --git a/test/e2e/minikube/run-test.sh b/test/e2e/minikube/run-test.sh
@@ -24,7 +24,7 @@ which go >/dev/null
 which ipfs >/dev/null
 which forge &>/dev/null || export PATH=$PATH:~/.bin/foundry
 which forge >/dev/null; which cast >/dev/null
-which minikube >/dev/null; which helmfile >/dev/null; which helm >/dev/null; which kustomize >/dev/null; which kubectl >/dev/null
+which minikube >/dev/null; which helmfile >/dev/null; which helm >/dev/null; which kubectl >/dev/null
 which docker >/dev/null
 
 # based on https://stackoverflow.com/a/31269848 / https://bobcopeland.com/blog/2012/10/goto-in-bash/

diff --git a/test/e2e/webui/run-test.sh b/test/e2e/webui/run-test.sh
@@ -8,7 +8,7 @@ trap 'pkill -f "kubectl port-forward" && kill $(jobs -p) &>/dev/null' EXIT
 cd "$(dirname "$0")"
 
 which curl >/dev/null; which jq >/dev/null; which xargs >/dev/null; which sed >/dev/null
-which minikube >/dev/null; which helmfile >/dev/null; which helm >/dev/null; which kustomize >/dev/null; which kubectl >/dev/null
+which minikube >/dev/null; which helmfile >/dev/null; which helm >/dev/null; which kubectl >/dev/null
 which npm >/dev/null
 
 echo "=============================================================================================="
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,8 @@ if [ "$1" = "teardown" ]; then @@
        exit 0
     fi
+    sudo chmod o+rw /run/containerd/containerd.sock
     ## 0: Generate helm template and inject it into constellation base image
     helmfile template -f "$CHART_PATH" > "$CONSTELLATION_PATH/image/base/mkosi.skeleton/usr/lib/helmfile-template"
@@ Expand Down @@