chore: move dev folder

GaloyMoney · Sep 29, 2023 · 71afb93 · 71afb93
1 parent 396a717
commit 71afb93
Show file tree

Hide file tree

Showing 81 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -19,6 +19,7 @@ jobs:
       - run: cd core/api && yarn install --frozen-lockfile
       - name: Run integration tests
         run: |
-          cd core/api/ && make integration-in-ci
+          cd core/api/
+          make integration-in-ci
           container_id=$(docker ps -q -f status=exited -f name="${PWD##*/}-integration-tests-")
           exit $(docker inspect $container_id --format='{{.State.ExitCode}}')
diff --git a/dev/.gitignore → core/api/dev/.gitignore b/dev/.gitignore → core/api/dev/.gitignore
diff --git a/dev/apollo-federation/README.md → core/api/dev/apollo-federation/README.md b/dev/apollo-federation/README.md → core/api/dev/apollo-federation/README.md
diff --git a/dev/apollo-federation/router.yaml → core/api/dev/apollo-federation/router.yaml b/dev/apollo-federation/router.yaml → core/api/dev/apollo-federation/router.yaml
diff --git a/dev/apollo-federation/supergraph-config.yaml → .../apollo-federation/supergraph-config.yaml b/dev/apollo-federation/supergraph-config.yaml → .../apollo-federation/supergraph-config.yaml
@@ -3,4 +3,4 @@ subgraphs:
   public:
     routing_url: http://bats-tests:4012/graphql
     schema:
-      file: ../../core/api/src/graphql/public/schema.graphql
+      file: ../../src/graphql/public/schema.graphql
diff --git a/dev/apollo-federation/supergraph.graphql → .../dev/apollo-federation/supergraph.graphql b/dev/apollo-federation/supergraph.graphql → .../dev/apollo-federation/supergraph.graphql
diff --git a/dev/appcheck/README.md → core/api/dev/appcheck/README.md b/dev/appcheck/README.md → core/api/dev/appcheck/README.md
diff --git a/dev/bin/gen-test-jwt.ts → core/api/dev/bin/gen-test-jwt.ts b/dev/bin/gen-test-jwt.ts → core/api/dev/bin/gen-test-jwt.ts
diff --git a/dev/bin/save-lnd-data.sh → core/api/dev/bin/save-lnd-data.sh b/dev/bin/save-lnd-data.sh → core/api/dev/bin/save-lnd-data.sh
diff --git a/dev/bin/save-loop-data.sh → core/api/dev/bin/save-loop-data.sh b/dev/bin/save-loop-data.sh → core/api/dev/bin/save-loop-data.sh
diff --git a/dev/bin/start-loopd.sh → core/api/dev/bin/start-loopd.sh b/dev/bin/start-loopd.sh → core/api/dev/bin/start-loopd.sh
diff --git a/dev/bitcoind/bitcoin.conf → core/api/dev/bitcoind/bitcoin.conf b/dev/bitcoind/bitcoin.conf → core/api/dev/bitcoind/bitcoin.conf
diff --git a/dev/bria.yml → core/api/dev/bria.yml b/dev/bria.yml → core/api/dev/bria.yml
diff --git a/dev/fulcrum/fulcrum.conf → core/api/dev/fulcrum/fulcrum.conf b/dev/fulcrum/fulcrum.conf → core/api/dev/fulcrum/fulcrum.conf
diff --git a/dev/fulcrum/tls.cert → core/api/dev/fulcrum/tls.cert b/dev/fulcrum/tls.cert → core/api/dev/fulcrum/tls.cert
diff --git a/dev/fulcrum/tls.key → core/api/dev/fulcrum/tls.key b/dev/fulcrum/tls.key → core/api/dev/fulcrum/tls.key
diff --git a/dev/lnd/lnd.conf → core/api/dev/lnd/lnd.conf b/dev/lnd/lnd.conf → core/api/dev/lnd/lnd.conf
diff --git a/dev/lnd/lnd1.tpub → core/api/dev/lnd/lnd1.tpub b/dev/lnd/lnd1.tpub → core/api/dev/lnd/lnd1.tpub
diff --git a/...oop/regtest/loopd1-1.loop.macaroon.base64 → ...oop/regtest/loopd1-1.loop.macaroon.base64 b/...oop/regtest/loopd1-1.loop.macaroon.base64 → ...oop/regtest/loopd1-1.loop.macaroon.base64
diff --git a/dev/lnd/loop/regtest/loopd1-1.tls.cert → ...pi/dev/lnd/loop/regtest/loopd1-1.tls.cert b/dev/lnd/loop/regtest/loopd1-1.tls.cert → ...pi/dev/lnd/loop/regtest/loopd1-1.tls.cert
diff --git a/...lnd/loop/regtest/loopd1-1.tls.cert.base64 → ...lnd/loop/regtest/loopd1-1.tls.cert.base64 b/...lnd/loop/regtest/loopd1-1.tls.cert.base64 → ...lnd/loop/regtest/loopd1-1.tls.cert.base64
diff --git a/dev/lnd/loop/regtest/loopd1-1.tls.key → ...api/dev/lnd/loop/regtest/loopd1-1.tls.key b/dev/lnd/loop/regtest/loopd1-1.tls.key → ...api/dev/lnd/loop/regtest/loopd1-1.tls.key
diff --git a/...oop/regtest/loopd2-1.loop.macaroon.base64 → ...oop/regtest/loopd2-1.loop.macaroon.base64 b/...oop/regtest/loopd2-1.loop.macaroon.base64 → ...oop/regtest/loopd2-1.loop.macaroon.base64
diff --git a/dev/lnd/loop/regtest/loopd2-1.tls.cert → ...pi/dev/lnd/loop/regtest/loopd2-1.tls.cert b/dev/lnd/loop/regtest/loopd2-1.tls.cert → ...pi/dev/lnd/loop/regtest/loopd2-1.tls.cert
diff --git a/...lnd/loop/regtest/loopd2-1.tls.cert.base64 → ...lnd/loop/regtest/loopd2-1.tls.cert.base64 b/...lnd/loop/regtest/loopd2-1.tls.cert.base64 → ...lnd/loop/regtest/loopd2-1.tls.cert.base64
diff --git a/dev/lnd/loop/regtest/loopd2-1.tls.key → ...api/dev/lnd/loop/regtest/loopd2-1.tls.key b/dev/lnd/loop/regtest/loopd2-1.tls.key → ...api/dev/lnd/loop/regtest/loopd2-1.tls.key
diff --git a/...gtest/lnd-outside-1.admin.macaroon.base64 → ...gtest/lnd-outside-1.admin.macaroon.base64 b/...gtest/lnd-outside-1.admin.macaroon.base64 → ...gtest/lnd-outside-1.admin.macaroon.base64
diff --git a/dev/lnd/regtest/lnd-outside-1.pubkey → .../api/dev/lnd/regtest/lnd-outside-1.pubkey b/dev/lnd/regtest/lnd-outside-1.pubkey → .../api/dev/lnd/regtest/lnd-outside-1.pubkey
diff --git a/...gtest/lnd-outside-2.admin.macaroon.base64 → ...gtest/lnd-outside-2.admin.macaroon.base64 b/...gtest/lnd-outside-2.admin.macaroon.base64 → ...gtest/lnd-outside-2.admin.macaroon.base64
diff --git a/dev/lnd/regtest/lnd-outside-2.pubkey → .../api/dev/lnd/regtest/lnd-outside-2.pubkey b/dev/lnd/regtest/lnd-outside-2.pubkey → .../api/dev/lnd/regtest/lnd-outside-2.pubkey
diff --git a/dev/lnd/regtest/lnd1.admin.macaroon.base64 → ...ev/lnd/regtest/lnd1.admin.macaroon.base64 b/dev/lnd/regtest/lnd1.admin.macaroon.base64 → ...ev/lnd/regtest/lnd1.admin.macaroon.base64
diff --git a/dev/lnd/regtest/lnd1.pubkey → core/api/dev/lnd/regtest/lnd1.pubkey b/dev/lnd/regtest/lnd1.pubkey → core/api/dev/lnd/regtest/lnd1.pubkey
diff --git a/dev/lnd/regtest/lnd2.admin.macaroon.base64 → ...ev/lnd/regtest/lnd2.admin.macaroon.base64 b/dev/lnd/regtest/lnd2.admin.macaroon.base64 → ...ev/lnd/regtest/lnd2.admin.macaroon.base64
diff --git a/dev/lnd/regtest/lnd2.pubkey → core/api/dev/lnd/regtest/lnd2.pubkey b/dev/lnd/regtest/lnd2.pubkey → core/api/dev/lnd/regtest/lnd2.pubkey
diff --git a/dev/lnd/tls.cert → core/api/dev/lnd/tls.cert b/dev/lnd/tls.cert → core/api/dev/lnd/tls.cert
diff --git a/dev/lnd/tls.cert.base64 → core/api/dev/lnd/tls.cert.base64 b/dev/lnd/tls.cert.base64 → core/api/dev/lnd/tls.cert.base64
diff --git a/dev/lnd/tls.key → core/api/dev/lnd/tls.key b/dev/lnd/tls.key → core/api/dev/lnd/tls.key
diff --git a/dev/lnd/tls.key.base64 → core/api/dev/lnd/tls.key.base64 b/dev/lnd/tls.key.base64 → core/api/dev/lnd/tls.key.base64
diff --git a/dev/ory/body.jsonnet → core/api/dev/ory/body.jsonnet b/dev/ory/body.jsonnet → core/api/dev/ory/body.jsonnet
diff --git a/...email_no_password_v0.identity.schema.json → ...email_no_password_v0.identity.schema.json b/...email_no_password_v0.identity.schema.json → ...email_no_password_v0.identity.schema.json
diff --git a/dev/ory/jwks.json → core/api/dev/ory/jwks.json b/dev/ory/jwks.json → core/api/dev/ory/jwks.json
diff --git a/dev/ory/kratos.yml → core/api/dev/ory/kratos.yml b/dev/ory/kratos.yml → core/api/dev/ory/kratos.yml
diff --git a/dev/ory/oathkeeper.yml → core/api/dev/ory/oathkeeper.yml b/dev/ory/oathkeeper.yml → core/api/dev/ory/oathkeeper.yml
diff --git a/dev/ory/oathkeeper_rules.yaml → core/api/dev/ory/oathkeeper_rules.yaml b/dev/ory/oathkeeper_rules.yaml → core/api/dev/ory/oathkeeper_rules.yaml
diff --git a/...email_no_password_v0.identity.schema.json → ...email_no_password_v0.identity.schema.json b/...email_no_password_v0.identity.schema.json → ...email_no_password_v0.identity.schema.json
diff --git a/...phone_no_password_v0.identity.schema.json → ...phone_no_password_v0.identity.schema.json b/...phone_no_password_v0.identity.schema.json → ...phone_no_password_v0.identity.schema.json
diff --git a/...password_deviceid_v0.identity.schema.json → ...password_deviceid_v0.identity.schema.json b/...password_deviceid_v0.identity.schema.json → ...password_deviceid_v0.identity.schema.json
diff --git a/dev/otel-agent-config.yaml → core/api/dev/otel-agent-config.yaml b/dev/otel-agent-config.yaml → core/api/dev/otel-agent-config.yaml
diff --git a/dev/stablesats.yml → core/api/dev/stablesats.yml b/dev/stablesats.yml → core/api/dev/stablesats.yml
diff --git a/dev/svix/README.md → core/api/dev/svix/README.md b/dev/svix/README.md → core/api/dev/svix/README.md
diff --git a/core/api/docker-compose.yml b/core/api/docker-compose.yml
@@ -291,7 +291,7 @@ services:
     command: ["make", "execute-bats-from-within-container"]
     working_dir: /repo
     env_file:
-      - ${TMP_ENV_CI:-.env.ci}
+      - ${TMP_ENV_CI:-../../.env.ci}
     environment:
       - GALOY_ENDPOINT=oathkeeper:4455
       - OATHKEEPER_ENDPOINT=http://${OATHKEEPER_HOST:-oathkeeper}:${OATHKEEPER_PORT:-4456}/decisions/
@@ -307,7 +307,7 @@ services:
     command: ["make", "execute-integration-from-within-container"]
     working_dir: /repo
     env_file:
-      - ${TMP_ENV_CI:-.env.ci}
+      - ${TMP_ENV_CI:-../../.env.ci}
     volumes:
       - ./:/repo
   stablesats:

diff --git a/junit.xml → core/api/junit.xml b/junit.xml → core/api/junit.xml
diff --git a/core/api/package.json b/core/api/package.json
@@ -9,7 +9,7 @@
     "build": "tsc -p tsconfig-build.json && cp -R src/services/price/protos lib/services/price/ && cp -R src/services/dealer-price/proto lib/services/dealer-price/ && cp -R src/services/loopd/protos lib/services/loopd/ && cp -R src/services/bria/proto lib/services/bria/ && tscpaths --silent -p tsconfig.json -s ./src -o ./lib",
     "trigger": "yarn build && node lib/servers/trigger.js | pino-pretty -c -l",
     "check:sdl": ". ../../.env && yarn write-sdl && if git diff --name-only | grep -q 'core/api/src/graphql/admin/schema.graphql'; then echo 'Error: core/api/src/graphql/admin/schema.graphql has changes, run `make codegen` and re-recommit' >&2; exit 1; fi && if git diff --name-only | grep -q 'core/api/src/graphql/public/schema.graphql'; then echo 'Error: core/api/src/graphql/public/schema.graphql has changes, run `make codegen` and re-recommit' >&2; exit 1; fi",
-    "write-sdl": "yarn build && node lib/servers/write-sdl.js write-sdl.yaml && rover supergraph compose --config ../../dev/apollo-federation/supergraph-config.yaml --elv2-license accept > ../../dev/apollo-federation/supergraph.graphql",
+    "write-sdl": "yarn build && node lib/servers/write-sdl.js write-sdl.yaml && rover supergraph compose --config dev/apollo-federation/supergraph-config.yaml --elv2-license accept > dev/apollo-federation/supergraph.graphql",
     "ws": "yarn build && node lib/servers/ws-server.js | pino-pretty -c -l",
     "watch": "nodemon -V -e ts,graphql -w ./src -x yarn run start",
     "watch-trigger": "nodemon -V -e ts,graphql -w ./src -x yarn trigger",
@@ -27,7 +27,7 @@
     "watch-main": ". ../../.env && nodemon -V -e ts,graphql -w ./src --exec yarn run start-main",
     "start-main": ". ../../.env && yarn run build && node --inspect -r ./lib/services/tracing.js ./lib/servers/graphql-main-server.js",
     "migrate-mongo-up": "migrate-mongo up -f './src/migrations/migrate-mongo-config.js'",
-    "gen-test-jwt": "ts-node ../../dev/bin/gen-test-jwt.ts"
+    "gen-test-jwt": "ts-node dev/bin/gen-test-jwt.ts"
   },
   "engines": {
     "node": "20"

diff --git a/scripts/mongodb-migrate.sh → core/api/scripts/mongodb-migrate.sh b/scripts/mongodb-migrate.sh → core/api/scripts/mongodb-migrate.sh
diff --git a/dev/lnd/loop/regtest/loopd1-1.loop.db b/dev/lnd/loop/regtest/loopd1-1.loop.db
diff --git a/dev/lnd/loop/regtest/loopd1-1.loop.macaroon b/dev/lnd/loop/regtest/loopd1-1.loop.macaroon
diff --git a/dev/lnd/loop/regtest/loopd1-1.macaroons.db b/dev/lnd/loop/regtest/loopd1-1.macaroons.db
diff --git a/dev/lnd/loop/regtest/loopd2-1.loop.db b/dev/lnd/loop/regtest/loopd2-1.loop.db
diff --git a/dev/lnd/loop/regtest/loopd2-1.loop.macaroon b/dev/lnd/loop/regtest/loopd2-1.loop.macaroon
diff --git a/dev/lnd/loop/regtest/loopd2-1.macaroons.db b/dev/lnd/loop/regtest/loopd2-1.macaroons.db
diff --git a/dev/lnd/loop/server/regtest/admin.macaroon b/dev/lnd/loop/server/regtest/admin.macaroon
diff --git a/dev/lnd/loop/server/regtest/chainnotifier.macaroon b/dev/lnd/loop/server/regtest/chainnotifier.macaroon
diff --git a/dev/lnd/loop/server/regtest/invoices.macaroon b/dev/lnd/loop/server/regtest/invoices.macaroon
diff --git a/dev/lnd/loop/server/regtest/readonly.macaroon b/dev/lnd/loop/server/regtest/readonly.macaroon
diff --git a/dev/lnd/loop/server/regtest/router.macaroon b/dev/lnd/loop/server/regtest/router.macaroon
diff --git a/dev/lnd/loop/server/regtest/signer.macaroon b/dev/lnd/loop/server/regtest/signer.macaroon
diff --git a/dev/lnd/loop/server/regtest/walletkit.macaroon b/dev/lnd/loop/server/regtest/walletkit.macaroon
diff --git a/dev/lnd/regtest/lnd-outside-1.admin.macaroon b/dev/lnd/regtest/lnd-outside-1.admin.macaroon
diff --git a/dev/lnd/regtest/lnd-outside-1.macaroons.db b/dev/lnd/regtest/lnd-outside-1.macaroons.db
diff --git a/dev/lnd/regtest/lnd-outside-1.wallet.db b/dev/lnd/regtest/lnd-outside-1.wallet.db
diff --git a/dev/lnd/regtest/lnd-outside-2.admin.macaroon b/dev/lnd/regtest/lnd-outside-2.admin.macaroon
diff --git a/dev/lnd/regtest/lnd-outside-2.macaroons.db b/dev/lnd/regtest/lnd-outside-2.macaroons.db
diff --git a/dev/lnd/regtest/lnd-outside-2.wallet.db b/dev/lnd/regtest/lnd-outside-2.wallet.db
diff --git a/dev/lnd/regtest/lnd1.admin.macaroon b/dev/lnd/regtest/lnd1.admin.macaroon
diff --git a/dev/lnd/regtest/lnd1.macaroons.db b/dev/lnd/regtest/lnd1.macaroons.db
diff --git a/dev/lnd/regtest/lnd1.wallet.db b/dev/lnd/regtest/lnd1.wallet.db
diff --git a/dev/lnd/regtest/lnd2.admin.macaroon b/dev/lnd/regtest/lnd2.admin.macaroon
diff --git a/dev/lnd/regtest/lnd2.macaroons.db b/dev/lnd/regtest/lnd2.macaroons.db
diff --git a/dev/lnd/regtest/lnd2.wallet.db b/dev/lnd/regtest/lnd2.wallet.db
diff --git a/flake.nix b/flake.nix
@@ -26,6 +26,7 @@
         buck2
         pnpm
         python3
+        envsubst
         nodejs
         tilt
         yarn

diff --git a/typos.toml b/typos.toml
@@ -1,10 +1,12 @@
 files.extend-exclude = [
-  "dev",
-  "src/domain/users/languages.ts",
-  "src/services/loopd/protos",
+  "core/api/dev",
+  "core/api/src/domain/users/languages.ts",
+  "core/api/src/services/loopd/protos",
   "docs/postman-collection/galoy_graphql_main_api.postman_collection.json",
-  "docker-compose.yml",
-  "quickstart/*.yml"
+  "core/api/docker-compose.yml",
+  "quickstart/*.yml",
+  "quickstart/galoy",
+  "quickstart/dev",
 ]
 
 default.extend-ignore-identifiers-re = [
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ @@
             buck2
             pnpm
             python3
+            envsubst
             nodejs
             tilt
             yarn
@@ Expand Down @@