Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix XCM tests for 1.14 release #1100

Open
wants to merge 1 commit into
base: unique-polkadot-1.14
Choose a base branch
from
Open

Fix XCM tests for 1.14 release #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .baedeker/rewrites.example.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function(prev, repoDir)
'bin/polkadot': { dockerImage: 'parity/polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
'bin/acala': { dockerImage: 'acala/acala-node:%s' % dotenv.ACALA_BUILD_BRANCH },
'bin/moonbeam': { dockerImage: 'moonbeamfoundation/moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
'bin/assethub': { dockerImage: 'parity/polkadot-parachain:%s' % dotenv.STATEMINE_BUILD_BRANCH },
'bin/assethub': { dockerImage: 'parity/polkadot-parachain:%s' % dotenv.KUSAMA_ASSETHUB_BUILD_BRANCH },
'bin/astar': { dockerImage: 'staketechnologies/astar-collator:%s' % dotenv.ASTAR_BUILD_BRANCH },
'bin/polkadex': { dockerImage: 'polkadex/mainnet:%s' % dotenv.POLKADEX_BUILD_BRANCH },
'bin/hydradx': { dockerImage: 'galacticcouncil/hydra-dx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
Expand Down
102 changes: 61 additions & 41 deletions .baedeker/xcm-opal.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,50 @@ m = import 'baedeker-library/mixin/spec.libsonnet',
function(relay_spec)

local relay = {
name: 'relay',
bin: 'bin/polkadot',
validatorIdAssignment: 'staking',
spec: {Genesis:{
chain: relay_spec,
modify:: m.genericRelay($, hrmp = [
// [$.parachains.opal.paraId, $.parachains.westmint.paraId, 8, 512],
// [$.parachains.westmint.paraId, $.parachains.opal.paraId, 8, 512],
]),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
},
name: 'relay',
bin: 'bin/polkadot',
validatorIdAssignment: 'staking',
spec: {Genesis:{
chain: relay_spec,
modify:: bdk.mixer([
m.genericRelay($),
{
genesis+: {
runtimeGenesis+: {
runtime+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
scheduling_lookahead:5,
max_validators_per_core:2,
minimum_backing_votes:2,
needed_approvals:2,
on_demand_cores:5,
},
},
},
},
},
},
]),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
},
};

local unique = {
name: 'unique',
local opal = {
name: 'opal',
bin: 'bin/unique',
paraId: 1001,
paraId: 2037,
spec: {Genesis:{
modify:: m.genericPara($),
}},
Expand All @@ -40,32 +60,32 @@ local unique = {
'--increase-future-pool',
],
},
for name in ['alice', 'bob']
for name in ['alice', 'bob', 'charlie']
},
};

local assethub = {
name: 'assethub',
bin: 'bin/assethub',
paraId: 1002,
spec: {Genesis:{
chain: 'asset-hub-westend-local',
modify:: m.genericPara($),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
name: 'assethub',
bin: 'bin/assethub',
paraId: 1000,
spec: {Genesis:{
chain: 'asset-hub-westend-local',
modify:: m.genericPara($),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob']
},
},
for name in ['alice', 'bob']
},
};

relay + {
parachains: {
[para.name]: para,
for para in [unique, assethub]
},
parachains: {
[para.name]: para,
for para in [opal, assethub]
},
}
115 changes: 65 additions & 50 deletions .baedeker/xcm-quartz.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,50 @@ m = import 'baedeker-library/mixin/spec.libsonnet',
function(relay_spec, assethub_spec)

local relay = {
name: 'relay',
bin: 'bin/polkadot',
validatorIdAssignment: 'staking',
spec: {Genesis:{
chain: relay_spec,
modify:: m.genericRelay($, hrmp = std.join([], [
// [[$.parachains[a].paraId, $.parachains[b].paraId, 8, 512], [$.parachains[b].paraId, $.parachains[a].paraId, 8, 512]],
// for [a, b] in [
// ['quartz', 'karura'],
// ['quartz', 'moonriver'],
// ['quartz', 'statemine'],
// ['quartz', 'shiden'],
// ]
])),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly', 'iggy', 'john', 'kurt']
},
name: 'relay',
bin: 'bin/polkadot',
validatorIdAssignment: 'staking',
spec: {Genesis:{
chain: relay_spec,
modify:: bdk.mixer([
m.genericRelay($),
{
genesis+: {
runtimeGenesis+: {
runtime+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
scheduling_lookahead:5,
max_validators_per_core:2,
minimum_backing_votes:2,
needed_approvals:2,
on_demand_cores:5,
},
},
},
},
},
},
]),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
},
};

local unique = {
name: 'unique',
local quartz = {
name: 'quartz',
bin: 'bin/unique',
paraId: 1001,
paraId: 2095,
spec: {Genesis:{
modify:: m.genericPara($),
}},
Expand All @@ -49,10 +64,30 @@ local unique = {
},
};

local assethub = {
name: 'assethub',
bin: 'bin/assethub',
paraId: 1000,
spec: {
FromScratchGenesis: {
spec: m.genericPara($)(assethub_spec),
}
},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob']
},
};

local karura = {
name: 'karura',
bin: 'bin/acala',
paraId: 1002,
paraId: 2000,
spec: {Genesis:{
chain: 'karura-dev',
modify:: bdk.mixer([
Expand All @@ -75,7 +110,7 @@ local moonriver = {
name: 'moonriver',
bin: 'bin/moonbeam',
signatureSchema: 'Ethereum',
paraId: 1003,
paraId: 2023,
spec: {Genesis:{
chain: 'moonriver-local',
specFilePrefix: 'moonriver-local-',
Expand All @@ -92,30 +127,10 @@ local moonriver = {
},
};

local assethub = {
name: 'assethub',
bin: 'bin/assethub',
paraId: 1004,
spec: {
FromScratchGenesis: {
spec: m.genericPara($)(assethub_spec),
}
},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob']
},
};

local shiden = {
name: 'shiden',
bin: 'bin/astar',
paraId: 1005,
paraId: 2007,
spec: {Genesis:{
chain: 'shiden-dev',
modify:: m.genericPara($),
Expand All @@ -134,6 +149,6 @@ local shiden = {
relay + {
parachains: {
[para.name]: para,
for para in [unique, karura, moonriver, assethub, shiden]
for para in [quartz, assethub, karura, moonriver, shiden]
},
}
Loading
Loading