Merge branch 'main' into release-0.3.4

hyperledger-solang · Jun 5, 2024 · 6677ff2 · 6677ff2
2 parents b93e2ab + 668f9f2
commit 6677ff2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+
+name: DCO
+
+on: [pull_request]
+
+jobs:
+  dco_check:
+    runs-on: ubuntu-latest
+    name: DCO
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+    - name: Get PR Commits
+      id: 'get-pr-commits'
+      uses: tim-actions/get-pr-commits@198af03565609bb4ed924d1260247b4881f09e7d
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+    - name: DCO Check
+      uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21
+      with:
+        commits: ${{ steps.get-pr-commits.outputs.commits }}
diff --git a/integration/solana/simple.spec.ts b/integration/solana/simple.spec.ts
@@ -351,7 +351,7 @@ describe('Simple solang tests', function () {
     it('account storage too small constructor', async function () {
         await expect(loadContractAndCallConstructor('store', [], 100))
             .rejects
-            .toThrowError(new Error('failed to send transaction: Transaction simulation failed: Error processing Instruction 0: account data too small for instruction'));
+            .toThrowError('Transaction simulation failed: Error processing Instruction 0: account data too small for instruction');
     });
 
     it('account storage too small dynamic alloc', async function () {
@@ -362,7 +362,7 @@ describe('Simple solang tests', function () {
         // set a load of string which will overflow
         await expect(program.methods.setFoo1().accounts({ dataAccount: storage.publicKey }).rpc())
             .rejects
-            .toThrowError(new Error('failed to send transaction: Transaction simulation failed: Error processing Instruction 0: account data too small for instruction'));
+            .toThrowError('Transaction simulation failed: Error processing Instruction 0: account data too small for instruction');
     });
 
     it('account storage too small dynamic realloc', async function () {
@@ -377,7 +377,7 @@ describe('Simple solang tests', function () {
         // do realloc until failure
         await expect(push_until_bang())
             .rejects
-            .toThrowError(new Error('failed to send transaction: Transaction simulation failed: Error processing Instruction 0: account data too small for instruction'));
+            .toThrowError('Transaction simulation failed: Error processing Instruction 0: account data too small for instruction');
     });
 
     it('arrays in account storage', async function () {