Skip to content

Commit 6a78edd

Browse files
authored
Bump chopsticks to 1.2.0 (#334)
* Bump `chopsticks` to `1.2.0` * Bump PJS to `16.4.1` `chopsticks-1.2.0` uses `polkadot-16.4.1`, so PET's PJS needs a bump too. * Cast dev accounts objects to`unknown` Depdendency mismatch for `@polkadot/keyring` between `chopsticks-utils` and `polkadot-ecosystem-tests/networks`. Even when `@polkadot/keyring` is set locally (PET) to the same version as in `chopsticks-utils`, the dependency mismatch is still present.
1 parent cc0a6ac commit 6a78edd

File tree

7 files changed

+301
-270
lines changed

7 files changed

+301
-270
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"@polkadot/api": "^16.0",
2020
"@polkadot/api-augment": "^16.0",
2121
"@polkadot/api-derive": "^16.0",
22+
"@polkadot/keyring": "^13.5.3",
2223
"@polkadot/rpc-augment": "^16.0",
2324
"@polkadot/rpc-core": "^16.0",
2425
"@polkadot/rpc-provider": "^16.0",

packages/kusama/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@e2e-test/kusama",
33
"type": "module",
44
"dependencies": {
5-
"@acala-network/chopsticks-testing": "^1.1.0",
5+
"@acala-network/chopsticks-testing": "^1.2.0",
66
"@e2e-test/shared": "workspace:*"
77
}
88
}

packages/networks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@e2e-test/networks",
33
"type": "module",
44
"dependencies": {
5-
"@acala-network/chopsticks-testing": "^1.1.0"
5+
"@acala-network/chopsticks-testing": "^1.2.0"
66
},
77
"main": "./dist/cjs/index.js",
88
"module": "./dist/esm/index.js",

packages/networks/src/defaultAccounts.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import type { KeyringInstance, KeyringPair } from '@polkadot/keyring/types'
44

55
import { cryptoWaitReady } from '@polkadot/util-crypto'
66

7-
export type DefaultAccounts = ReturnType<typeof testingPairs>
8-
9-
export const defaultAccounts: {
7+
export type DefaultAccounts = {
108
alice: KeyringPair
119
bob: KeyringPair
1210
charlie: KeyringPair
@@ -19,25 +17,16 @@ export const defaultAccounts: {
1917
ethan: KeyringPair
2018
keyring: Keyring
2119
keyringEth: KeyringInstance
22-
} = testingPairs()
20+
}
21+
22+
export const defaultAccounts: DefaultAccounts = testingPairs() as unknown as DefaultAccounts
2323

2424
/**
2525
* Sr25519 keyring pairs for use in tests.
2626
*
2727
* These are preferrable over Ed25519 because PJS offers Sr25519 development keypairs when used in conjunction with
2828
* `chopsticks`, which helps debugging tests when `pause()`ing.
2929
*/
30-
export const defaultAccountsSr25519: {
31-
alice: KeyringPair
32-
bob: KeyringPair
33-
charlie: KeyringPair
34-
dave: KeyringPair
35-
eve: KeyringPair
36-
alith: KeyringPair
37-
baltathar: KeyringPair
38-
charleth: KeyringPair
39-
dorothy: KeyringPair
40-
ethan: KeyringPair
41-
keyring: Keyring
42-
keyringEth: KeyringInstance
43-
} = await cryptoWaitReady().then(() => testingPairs('sr25519'))
30+
export const defaultAccountsSr25519: DefaultAccounts = (await cryptoWaitReady().then(() =>
31+
testingPairs('sr25519'),
32+
)) as unknown as DefaultAccounts

packages/polkadot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@e2e-test/polkadot",
33
"type": "module",
44
"dependencies": {
5-
"@acala-network/chopsticks-testing": "^1.1.0",
5+
"@acala-network/chopsticks-testing": "^1.2.0",
66
"@e2e-test/shared": "workspace:*"
77
}
88
}

packages/shared/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"name": "@e2e-test/shared",
33
"type": "module",
44
"dependencies": {
5-
"@acala-network/chopsticks": "^1.1.0",
6-
"@acala-network/chopsticks-testing": "^1.1.0",
5+
"@acala-network/chopsticks": "^1.2.0",
6+
"@acala-network/chopsticks-testing": "^1.2.0",
77
"@e2e-test/networks": "workspace:*",
8-
"@polkadot/api": "^16.1.1",
9-
"@polkadot/types": "^16.1.1",
10-
"@polkadot/types-augment": "^16.1.1"
8+
"@polkadot/api": "^16.4.1",
9+
"@polkadot/types": "^16.4.1",
10+
"@polkadot/types-augment": "^16.4.1"
1111
},
1212
"main": "./dist/cjs/index.js",
1313
"module": "./dist/esm/index.js",

0 commit comments

Comments
 (0)