integration of tests with postfixes

DMDcoin · Sep 23, 2024 · 2b7826a · 2b7826a
1 parent 5ec8cbd
commit 2b7826a
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 15 deletions.
diff --git a/api/data/interfaces.ts b/api/data/interfaces.ts
@@ -7,6 +7,7 @@ export interface BalanceV3 {
 export interface ClaimingBalance extends BalanceV3 {
     dmdv4Address: string;
     signature: string;
+    postfix?: string;
 }
 
 export interface ClaimingDataSet {

diff --git a/test/ClaimContract.spec.ts b/test/ClaimContract.spec.ts
@@ -329,28 +329,14 @@ describe('ClaimContract', () => {
 
             for (const balance of balances.balances) {
                 let balanceBeforeClaim = await ethers.provider.getBalance(balance.dmdv4Address);
-                await cryptoSol.claim(balance.dmdv3Address, balance.dmdv4Address, balance.signature, "");
+                await cryptoSol.claim(balance.dmdv3Address, balance.dmdv4Address, balance.signature, balance.postfix ?? "");
                 let balanceAfterClaim = await ethers.provider.getBalance(balance.dmdv4Address);
 
                 let expectedBalance = ethers.toBigInt(balance.value) + balanceBeforeClaim;
                 expect(balanceAfterClaim).to.equal(expectedBalance, 'Balance of DMDv4 adress matches defined Balance.');
             }
         }
 
-        describe("cryptographics with defined message prefix", async function () {
-            const claimToString = stringToUTF8Hex('claim to ');
-
-            async function deployWithPrefixFixture(): Promise<{ claimContract: ClaimContract }> {
-                const claimContract = await deployClaiming(
-                    lateClaimBeneficorAddress,
-                    lateClaimBeneficorDAO,
-                    claimToString
-                );
-
-                return { claimContract };
-            }
-        });
-
         describe("balance", async function () {
 
             it('fill() a balance testset', async () => {
@@ -466,6 +452,10 @@ describe('ClaimContract', () => {
                 await runAddAndClaimTests(getTestBalancesFromTestdata("known_y_00"));
             });
 
+            it("Claiming DMD with postfixes", async () => {
+                await runAddAndClaimTests(getTestBalancesFromTestdata("with_postfixes"));
+            });
+
             if (runLargeTests) {
                 it("Claiming DMD large test: balances_1k", async () => {
                     await runAddAndClaimTests(getTestBalancesFromTestdata("balances_1k"));
@@ -474,6 +464,7 @@ describe('ClaimContract', () => {
                 it("Claiming DMD large test: balances_50k", async () => {
                     await runAddAndClaimTests(getTestBalancesFromTestdata("balances_50k"));
                 }).timeout(60_000 * 60); // maximum 1 hour for this test.
+
             }
         });
 

diff --git a/test/testdata/with_postfixes.json b/test/testdata/with_postfixes.json
@@ -0,0 +1,75 @@
+{
+    "messagePrefix": "claim to: ",
+    "balances": [
+      {
+        "dmdv3Address": "dKoDxdQXemnyq4nEx9Qg1vo6xbFLkDLCeS",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IGrF5yu1HkMT5JkxBCAbDT78UGUoCgRDWtaYZgDSpsp6Dril0v1PNZcWRoYPeJd4QEUo7hdIiWHPsKgk2vFu4zM=",
+        "postfix": ""
+      },
+      {
+        "dmdv3Address": "dE8eQXMGvdBFhUa42fnGwpru3iRPdDcPJL",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IFEWZeRNsxLwaQmKOXB9373Ct6lALrMIrRiRTX5+uTEoRPXwPmvEheqYYY/OqHxK5VvXsy49IkZrBvHl1Q18Ado=",
+        "postfix": " -1"
+      },
+      {
+        "dmdv3Address": "dMfsCCttzYb9DhkQ4KoYBGfSuzKJ3G3jfA",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IEd83V2Jyhbm5+5CNsYaNUtiH3MNyySV47HwXkAabuU1cMkt/3md+f75ejOHoSNWg3oLtmcTLdSfWjfIjL18czI=",
+        "postfix": ""
+      },
+      {
+        "dmdv3Address": "dRnz8sahtS83WXRAzDLYp8nbrpFTN4edvK",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IOJoTwHju57HhQmRGAtehyW+KGnFZCL7SYbktKr6GTjtNig89peg0xZNQv9dGVDt9A3bZ/i9SIClgrZ80yeiSOQ=",
+        "postfix": " -3"
+      },
+      {
+        "dmdv3Address": "dZR8sL5wtJgwyMcfrAWsAhCoLyCWRJRdNd",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "ICIEHTeA8+bdXbTRLOwNRA2O5Kqc334SexLFIuzHZOPrFYgJ9ulUH5ID2qpLMCH3KrDwbeb6GHhuZMrkBSrVHOE=",
+        "postfix": " -4"
+      },
+      {
+        "dmdv3Address": "dXYqxZunxfJsyMjzVrMVKQku6qHCPbDvNo",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IFix7TxV2wvKtPANF6NcQ1n2ZM04mwoNkGgn3Wm0zZvlEorjwChDGyS8cJWa1VyFMq2LkuXG8H5MsAYatenUBCo=",
+        "postfix": " -5"
+      },
+      {
+        "dmdv3Address": "dYxJ61h5ZuCL2NYBniWzui7B2vYdBfD8mX",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IOo7zCVtObZLOCu+5wY3BqO04NRv5dFBijh0arf2M0mlOkMexcYRQZEHY4GrjR+fym3fZiDeCuIIcvkLsQV8wV4=",
+        "postfix": " -6"
+      },
+      {
+        "dmdv3Address": "dHBrAZzuittub9f8F2c5C7DaXD1KtBPwxi",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "INcBYlSEbdNjjI1GHPYVfZTLFWlsFwVBgMg0/nZsOS66HKhBbS5TzJ3QP7hU9KHeHh5ISRjW7o9o4qNP8ZKuVyY=",
+        "postfix": ""
+      },
+      {
+        "dmdv3Address": "dMzCVR54QZm1EQeX6sdnqF3WMy7Lrfkxox",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "IKkfrI1iT7/edRbJ1pgtjdY1annuZIkwsYDhNX+fYm3lE4emooIF4DPTvSvI49V4wa5V/pDQRGyInHvty7s6/lQ=",
+        "postfix": ""
+      },
+      {
+        "dmdv3Address": "dcJciN8svxCQYuEerwWqbDBWvaFYC3MhoK",
+        "dmdv4Address": "0xbb753f1126c2463Ac29e175B180dAE7F7f627fA4",
+        "value": "10000",
+        "signature": "INs9iRwVQbHPe5S0JYiJt8pDjJ7BI5ZQfn5j9ufQGq49B+Sdw5vKVz6LTI/0H9LRgICejl6G2EZybK3kpKAEoQs=",
+        "postfix": " -9"
+      }
+    ]
+  }