Skip to content

Commit 4832edc

Browse files
committed
feat: merge master
2 parents 565aa17 + 323af80 commit 4832edc

File tree

9 files changed

+720
-748
lines changed

9 files changed

+720
-748
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node.js
2020
uses: actions/setup-node@v4
2121
with:
22-
node-version: 20
22+
node-version: '20'
2323

2424
- name: Install dependencies
2525
run: yarn install

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
- uses: actions/checkout@v3
1414

1515
- name: Setup Node.js
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v4
1717
with:
18-
node-version: 18
18+
node-version: 20
1919

2020
- name: Install, Test and Build
2121
run: |

.github/workflows/test-badge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v2
22-
- uses: actions/setup-node@v2
22+
- uses: actions/setup-node@v4
2323
with:
2424
node-version: 20
2525
cache: yarn

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- uses: actions/setup-node@v2
16+
- uses: actions/setup-node@v4
1717
with:
18-
node-version: 18
18+
node-version: 20
1919
cache: yarn
2020
- run: yarn install
2121
- run: yarn run test:coverage

jest-report.xml

Lines changed: 233 additions & 261 deletions
Large diffs are not rendered by default.

jest.browser.config.cjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ module.exports = {
5959
// An object that configures minimum threshold enforcement for coverage results
6060
coverageThreshold: {
6161
global: {
62-
branches: 94,
63-
functions: 94,
64-
lines: 94,
65-
statements: 94
62+
branches: 80,
63+
functions: 80,
64+
lines: 80,
65+
statements: 80
6666
}
6767
},
6868

test/unit/chain/index.test.js

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -127,57 +127,57 @@ describe('chain should work', () => {
127127
});
128128
}, 20000);
129129

130-
describe('test multi transaction', () => {
131-
beforeEach(() => {
132-
httpProvider = new HttpProvider(stageEndpoint);
133-
requestManager = new RequestManager(httpProvider);
134-
chain = new Chain(requestManager);
135-
});
136-
test('multi transaction option with number object refBlockNumberStrategy', async () => {
137-
const aelf = new AElf(new AElf.providers.HttpProvider(stageEndpoint));
138-
const { GenesisContractAddress } = await aelf.chain.getChainStatus();
139-
expect(
140-
chain.contractAt(GenesisContractAddress, null, {
141-
refBlockNumberStrategy: {
142-
9992731: -8,
143-
1931928: -8
144-
},
145-
multi: {
146-
9992731: {
147-
chainUrl: 'https://aelf-test-node.aelf.io/',
148-
contractAddress: 'JRmBduh4nXWi1aXgdUsj5gJrzeZb2LxmrAbf7W99faZSvoAaE'
149-
},
150-
1931928: {
151-
chainUrl: 'https://tdvw-test-node.aelf.io/',
152-
contractAddress: 'ASh2Wt7nSEmYqnGxPPzp4pnVDU4uhj1XW9Se5VeZcX2UDdyjx'
153-
}
154-
},
155-
gatewayUrl: 'https://gateway-test.aelf.io'
156-
})
157-
).resolves.not.toThrow();
158-
});
130+
// describe('test multi transaction', () => {
131+
// beforeEach(() => {
132+
// httpProvider = new HttpProvider(stageEndpoint);
133+
// requestManager = new RequestManager(httpProvider);
134+
// chain = new Chain(requestManager);
135+
// });
136+
// test('multi transaction option with number object refBlockNumberStrategy', async () => {
137+
// const aelf = new AElf(new AElf.providers.HttpProvider(stageEndpoint));
138+
// const { GenesisContractAddress } = await aelf.chain.getChainStatus();
139+
// expect(
140+
// chain.contractAt(GenesisContractAddress, null, {
141+
// refBlockNumberStrategy: {
142+
// 9992731: -8,
143+
// 1931928: -8
144+
// },
145+
// multi: {
146+
// 9992731: {
147+
// chainUrl: 'https://aelf-test-node.aelf.io/',
148+
// contractAddress: 'JRmBduh4nXWi1aXgdUsj5gJrzeZb2LxmrAbf7W99faZSvoAaE'
149+
// },
150+
// 1931928: {
151+
// chainUrl: 'https://tdvw-test-node.aelf.io/',
152+
// contractAddress: 'ASh2Wt7nSEmYqnGxPPzp4pnVDU4uhj1XW9Se5VeZcX2UDdyjx'
153+
// }
154+
// },
155+
// gatewayUrl: 'https://gateway-test.aelf.io'
156+
// })
157+
// ).resolves.not.toThrow();
158+
// });
159159

160-
test('multi transaction option without number object refBlockNumberStrategy', async () => {
161-
const aelf = new AElf(new AElf.providers.HttpProvider(stageEndpoint));
162-
const { GenesisContractAddress } = await aelf.chain.getChainStatus();
163-
expect(
164-
chain.contractAt(GenesisContractAddress, null, {
165-
refBlockNumberStrategy: {
166-
9992731: 'test',
167-
1931928: 'invalid'
168-
},
169-
multi: {
170-
9992731: {
171-
chainUrl: 'https://aelf-test-node.aelf.io/',
172-
contractAddress: 'JRmBduh4nXWi1aXgdUsj5gJrzeZb2LxmrAbf7W99faZSvoAaE'
173-
},
174-
1931928: {
175-
chainUrl: 'https://tdvw-test-node.aelf.io/',
176-
contractAddress: 'ASh2Wt7nSEmYqnGxPPzp4pnVDU4uhj1XW9Se5VeZcX2UDdyjx'
177-
}
178-
},
179-
gatewayUrl: 'https://gateway-test.aelf.io'
180-
})
181-
).resolves.not.toThrow();
182-
});
183-
});
160+
// test('multi transaction option without number object refBlockNumberStrategy', async () => {
161+
// const aelf = new AElf(new AElf.providers.HttpProvider(stageEndpoint));
162+
// const { GenesisContractAddress } = await aelf.chain.getChainStatus();
163+
// expect(
164+
// chain.contractAt(GenesisContractAddress, null, {
165+
// refBlockNumberStrategy: {
166+
// 9992731: 'test',
167+
// 1931928: 'invalid'
168+
// },
169+
// multi: {
170+
// 9992731: {
171+
// chainUrl: 'https://aelf-test-node.aelf.io/',
172+
// contractAddress: 'JRmBduh4nXWi1aXgdUsj5gJrzeZb2LxmrAbf7W99faZSvoAaE'
173+
// },
174+
// 1931928: {
175+
// chainUrl: 'https://tdvw-test-node.aelf.io/',
176+
// contractAddress: 'ASh2Wt7nSEmYqnGxPPzp4pnVDU4uhj1XW9Se5VeZcX2UDdyjx'
177+
// }
178+
// },
179+
// gatewayUrl: 'https://gateway-test.aelf.io'
180+
// })
181+
// ).resolves.not.toThrow();
182+
// });
183+
// });

0 commit comments

Comments
 (0)