Skip to content

Commit 6f312b9

Browse files
authored
chore(): 4.0.0 stable (#2168)
<!-- Thanks for sending a pull request! --> #### What this PR does / why we need it: #### Which issue(s) does this PR fixes?: <!-- (Optional) Automatically closes linked issue when PR is merged. Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. --> Fixes # #### Additional comments?:
1 parent c7359c0 commit 6f312b9

File tree

4 files changed

+8
-22
lines changed

4 files changed

+8
-22
lines changed

apps/whale-api/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.7"
22

33
services:
44
defi-blockchain:
5-
image: defi/defichain:4.0.0-rc2
5+
image: defi/defichain:4.0.0
66

77
ports:
88
- "19554:19554"

packages/jellyfish-api-core/__tests__/category/masternode/setGov.locks.token.test.ts

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -250,25 +250,6 @@ describe('SetGov v0/locks/token', () => {
250250
const attributes = await testing.rpc.masternode.getGov('ATTRIBUTES')
251251
expect(attributes.ATTRIBUTES[`v0/locks/token/${tslaId}`]).toStrictEqual('false')
252252
}
253-
254-
// TODO(canonbrother): bug on 4.0.0-rc2, check on 4.0.0-stable later
255-
// // Lock invalid loan token string
256-
// await testing.rpc.masternode.setGov({ ATTRIBUTES: { 'v0/locks/token/abc': 'true' } })
257-
// await testing.generate(1)
258-
259-
// {
260-
// const attributes = await testing.rpc.masternode.getGov('ATTRIBUTES')
261-
// expect(attributes.ATTRIBUTES['v0/locks/token/abc']).toBeUndefined()
262-
// }
263-
264-
// // Unlock invalid loan token string
265-
// await testing.rpc.masternode.setGov({ ATTRIBUTES: { 'v0/locks/token/abc': 'false' } })
266-
// await testing.generate(1)
267-
268-
// {
269-
// const attributes = await testing.rpc.masternode.getGov('ATTRIBUTES')
270-
// expect(attributes.ATTRIBUTES['v0/locks/token/abc']).toBeUndefined()
271-
// }
272253
})
273254

274255
it('should update loan token if loan token is unlocked', async () => {
@@ -441,6 +422,11 @@ describe('SetGov v0/locks/token', () => {
441422
expect(txId.length).toStrictEqual(64)
442423
})
443424

425+
it('should fail if lock invalid token', async () => {
426+
const promise = testing.rpc.masternode.setGov({ ATTRIBUTES: { 'v0/locks/token/abc': 'true' } })
427+
await expect(promise).rejects.toThrow('Token should be defined as numeric ID')
428+
})
429+
444430
it('should not lock collateral token', async () => {
445431
// Try to lock collateral token
446432
const promise = testing.rpc.masternode.setGov({ ATTRIBUTES: { [`v0/locks/token/${dfiId}`]: 'true' } })

packages/testcontainers/src/containers/DeFiDContainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export abstract class DeFiDContainer extends DockerContainer {
3636
if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
3737
return process.env.DEFICHAIN_DOCKER_IMAGE
3838
}
39-
return 'defi/defichain:4.0.0-rc2' // renovate.json regexManagers
39+
return 'defi/defichain:4.0.0' // renovate.json regexManagers
4040
}
4141

4242
public static readonly DefaultStartOptions = {

packages/testcontainers/src/containers/NativeChainContainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class NativeChainContainer extends GenericContainer {
2929
if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
3030
return process.env.DEFICHAIN_DOCKER_IMAGE
3131
}
32-
return 'defi/defichain:4.0.0-rc2' // renovate.json regexManagers
32+
return 'defi/defichain:4.0.0' // renovate.json regexManagers
3333
}
3434

3535
public static readonly PREFIX = 'defichain-testcontainers-'

0 commit comments

Comments
 (0)