Added additional tests, reenabled other jobs

rpanic · rpanic · commit c8624a74b752 · 2024-04-11T13:06:56.000+02:00
diff --git a/.github/workflows/pull-request-develop.yml b/.github/workflows/pull-request-develop.yml
@@ -12,89 +12,89 @@ on:
 jobs:
   # Installs npm dependencies for the first time,
   # caching them in ~/.npm
-#  install:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: actions/setup-node@v3
-#        with:
-#          node-version: 18
-#          # This only caches ~/.npm, therefore each subsequent
-#          # job needs to run `npm ci` to install deps from npm cache
-#          # alternative is to cache `node_modules` directly
-#          # TODO:
-#          # https://www.voorhoede.nl/en/blog/super-fast-npm-install-on-github-actions/
-#          # Add caching of `node_modules` to speed up this workflow
-#          cache: npm
-#
-#      # install dependencies from the package-lock.json
-#      - name: Install dependencies
-#        run: npm ci --workspaces
-#
-#  # builds all packages
-#  build:
-#    runs-on: ubuntu-latest
-#    needs: install
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: actions/setup-node@v3
-#        with:
-#          node-version: 18
-#          cache: npm
-#
-#      - name: "Install dependencies"
-#        run: npm ci --workspaces --include-workspace-root
-#
-#      - name: "Build"
-#        run: npm run build
-#
-#  # lints all packages
-#  lint:
-#    runs-on: ubuntu-latest
-#    needs: install
-#    steps:
-#      # check out the repository
-#      - uses: actions/checkout@v3
-#      - uses: actions/setup-node@v3
-#        with:
-#          node-version: 18
-#          cache: npm
-#
-#      - name: "Install dependencies"
-#        run: npm ci --workspaces --include-workspace-root
-#
-#      - name: "Build"
-#        run: npm run build
-#
-#      - name: "Lint"
-#        run: npm run lint
-#
-#      - name: "Check formatting"
-#        run: npx prettier ./packages --check
-#
-#  # tests all packages
-#  test:
-#    runs-on: ubuntu-latest
-#    needs: install
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: actions/setup-node@v3
-#        with:
-#          node-version: 18
-#          cache: npm
-#
-#      - name: "Install dependencies"
-#        run: npm ci --workspaces --include-workspace-root
-#
-#      - name: "Build"
-#        run: npm run build
-#
-#      - name: "Test"
-#        run: npm run test:ci
+  install:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          # This only caches ~/.npm, therefore each subsequent
+          # job needs to run `npm ci` to install deps from npm cache
+          # alternative is to cache `node_modules` directly
+          # TODO:
+          # https://www.voorhoede.nl/en/blog/super-fast-npm-install-on-github-actions/
+          # Add caching of `node_modules` to speed up this workflow
+          cache: npm
+
+      # install dependencies from the package-lock.json
+      - name: Install dependencies
+        run: npm ci --workspaces
+
+  # builds all packages
+  build:
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+
+      - name: "Install dependencies"
+        run: npm ci --workspaces --include-workspace-root
+
+      - name: "Build"
+        run: npm run build
+
+  # lints all packages
+  lint:
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      # check out the repository
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+
+      - name: "Install dependencies"
+        run: npm ci --workspaces --include-workspace-root
+
+      - name: "Build"
+        run: npm run build
+
+      - name: "Lint"
+        run: npm run lint
+
+      - name: "Check formatting"
+        run: npx prettier ./packages --check
+
+  # tests all packages
+  test:
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+
+      - name: "Install dependencies"
+        run: npm ci --workspaces --include-workspace-root
+
+      - name: "Build"
+        run: npm run build
+
+      - name: "Test"
+        run: npm run test:ci
 
   integration:
     runs-on: ubuntu-latest
-#    needs: test
+    needs: test
 
     env:
       POSTGRES_URL: localhost
diff --git a/packages/persistance/test-integration/PrismaBlockProduction.test.ts b/packages/persistance/test-integration/PrismaBlockProduction.test.ts
@@ -1,30 +1,31 @@
 import "reflect-metadata";
 import {
   afterAll,
-  afterEach,
   beforeAll,
   describe,
   expect,
 } from "@jest/globals";
 import { expectDefined, equalProvable } from "@proto-kit/common";
-import { Balance, TokenId } from "@proto-kit/library";
+import { BalancesKey, TokenId } from "@proto-kit/library";
 import { NetworkState } from "@proto-kit/protocol";
 import { AppChainTransaction } from "@proto-kit/sdk";
 import { ComputedBlock, UnprovenBlock } from "@proto-kit/sequencer";
 import { PrivateKey, PublicKey } from "o1js";
 import { container } from "tsyringe";
+
 import {
   PrismaBatchStore,
   PrismaBlockStorage,
-  PrismaTransactionStorage
+  PrismaTransactionStorage,
 } from "../src";
+
 import {
   createPrismaAppchain,
   IntegrationTestDBConfig,
-  prepareBlock
+  prepareBlock,
 } from "./utils";
 
-describe("Prisma integration", () => {
+describe("prisma integration", () => {
   let appChain: ReturnType<typeof createPrismaAppchain>;
 
   const sender = PrivateKey.random();
@@ -145,6 +146,49 @@ describe("Prisma integration", () => {
 
       expect(accountState).toBeUndefined();
     });
+
+    it("should fetch balance change", async () => {
+      const balance = await appChain.query.runtime.Balances.balances.get(
+        BalancesKey.from(TokenId.from(0), sender.toPublicKey())
+      );
+
+      expectDefined(balance);
+
+      expect(balance.toString()).toStrictEqual("100");
+    });
+
+    describe("add balance to second account", () => {
+      const sender2 = PrivateKey.random();
+
+      beforeAll(async () => {
+        appChain.configurePartial({
+          Signer: {
+            signer: sender2,
+          },
+        });
+        await prepareBlock(appChain, sender2.toPublicKey(), 0);
+      });
+
+      it("should produce the block", async () => {
+        const [block, batch] = await appChain.sequencer
+          .resolve("BlockTrigger")
+          .produceBlock();
+
+        expectDefined(block);
+        expectDefined(batch);
+        expect(block.transactions).toHaveLength(1);
+      }, 30000);
+
+      it("should retrieve correct balance for account 2", async () => {
+        const balance = await appChain.query.runtime.Balances.balances.get(
+          BalancesKey.from(TokenId.from(0), sender2.toPublicKey())
+        );
+
+        expectDefined(balance);
+
+        expect(balance.toString()).toStrictEqual("100");
+      });
+    });
   });
 
   describe("persisted mempool", () => {
@@ -153,7 +197,11 @@ describe("Prisma integration", () => {
     beforeAll(async () => {
       await setup();
 
-      transaction = await prepareBlock(appChain, sender.toPublicKey(), senderNonce);
+      transaction = await prepareBlock(
+        appChain,
+        sender.toPublicKey(),
+        senderNonce
+      );
       senderNonce++;
     });
 
@@ -174,7 +222,10 @@ describe("Prisma integration", () => {
     });
 
     it("should resolve transaction from storage as pending", async () => {
-      const txResolver = appChain.sequencer.resolveOrFail("TransactionStorage", PrismaTransactionStorage);
+      const txResolver = appChain.sequencer.resolveOrFail(
+        "TransactionStorage",
+        PrismaTransactionStorage
+      );
 
       const txs = await txResolver.getPendingUserTransactions();
 
diff --git a/packages/persistance/test-integration/SequencerRestart.test.ts b/packages/persistance/test-integration/SequencerRestart.test.ts
@@ -1,31 +1,14 @@
 import "reflect-metadata";
 import { afterAll, beforeAll, expect } from "@jest/globals";
-import { expectDefined, log } from "@proto-kit/common";
-import { Field, Poseidon, PrivateKey } from "o1js";
+import { expectDefined } from "@proto-kit/common";
+import { PrivateKey } from "o1js";
 import { container } from "tsyringe";
+
 import {
   createPrismaAppchain,
   IntegrationTestDBConfig,
   prepareBlock,
 } from "./utils";
-import { Prisma } from "@prisma/client";
-
-log.setLevel("TRACE")
-
-// describe("Decimal", () => {
-//
-//   it("decimal", () => {
-//     const f = Poseidon.hash([Field(5)])
-//
-//     const Decimal = Prisma.Decimal.clone({
-//       precision: 78,
-//     });
-//
-//     const d = new Decimal(f.toString());
-//     expect(d.toFixed()).toStrictEqual(f.toString())
-//   })
-//
-// })
 
 describe("sequencer restart", () => {
   let appChain: ReturnType<typeof createPrismaAppchain>;
@@ -64,7 +47,7 @@ describe("sequencer restart", () => {
 
     const blockTrigger = appChain.sequencer.resolve("BlockTrigger");
 
-    console.log(sender.toPublicKey().toBase58())
+    console.log(sender.toPublicKey().toBase58());
 
     for (let block = 0; block < 2; block++) {
       await prepareBlock(appChain, sender.toPublicKey(), senderNonce);
