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

Jump to bottom

fix: reduce controller config boilerplate #555

Merged
merged 3 commits into from
May 17, 2021
Merged

fix: reduce controller config boilerplate #555

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dca0401
reduce controller config boilerplate
TarikGul May 17, 2021
558bf9a
fix type doc for ControllerConfig
TarikGul May 17, 2021
3276a2b
remove unnecessary comment
TarikGul May 17, 2021
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
47 changes: 23 additions & 24 deletions src/chains-config/defaultControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,29 @@ import { ControllerConfig } from '../types/chains-config';
* the optimal controller selection for Polkadot and Kusama.
*/
export const defaultControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksTrace: false,
BlocksExtrinsics: true,
AccountsAssets: true,
AccountsStakingPayouts: true,
AccountsBalanceInfo: true,
AccountsStakingInfo: true,
AccountsVestingInfo: true,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: true,
PalletsStakingProgress: true,
PalletsStorage: true,
Paras: true,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'AccountsAssets',
'AccountsStakingPayouts',
'AccountsBalanceInfo',
'AccountsStakingInfo',
'AccountsVestingInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsAssets',
'PalletsStakingProgress',
'PalletsStorage',
'Paras',
],
options: {
finalizes: true,
minCalcFeeRuntime: null,
Expand Down
40 changes: 16 additions & 24 deletions src/chains-config/dockMainnetControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,22 @@ import { getBlockWeight } from './metadata-consts';
* Controllers for Dock's mainnet.
*/
export const dockMainnetControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksExtrinsics: true,
BlocksTrace: false,
AccountsAssets: false,
AccountsStakingPayouts: false,
AccountsBalanceInfo: true,
AccountsStakingInfo: false,
AccountsVestingInfo: false,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: false,
PalletsStakingProgress: false,
PalletsStorage: true,
Paras: false,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'AccountsBalanceInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsStorage',
],
options: {
finalizes: true,
minCalcFeeRuntime: 1,
Expand Down
40 changes: 16 additions & 24 deletions src/chains-config/dockTestnetControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,22 @@ import { ControllerConfig } from '../types/chains-config';
* Controllers for Dock's test network.
*/
export const dockTestnetControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksExtrinsics: true,
BlocksTrace: false,
AccountsAssets: false,
AccountsStakingPayouts: false,
AccountsBalanceInfo: true,
AccountsStakingInfo: false,
AccountsVestingInfo: false,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: false,
PalletsStakingProgress: false,
PalletsStorage: true,
Paras: false,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'AccountsBalanceInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsStorage',
],
options: {
finalizes: true,
minCalcFeeRuntime: 1,
Expand Down
11 changes: 3 additions & 8 deletions src/chains-config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,10 @@ export function getControllersForSpec(
*/
function getControllersFromConfig(api: ApiPromise, config: ControllerConfig) {
// If we don't typecast here, tsc thinks its just [string, any][]
const controllersToInclude = Object.entries(config.controllers) as [
keyof typeof controllers,
boolean
][];
const controllersToInclude = config.controllers;

return controllersToInclude.reduce((acc, [controllerName, shouldMount]) => {
if (shouldMount) {
acc.push(new controllers[controllerName](api, config.options));
}
return controllersToInclude.reduce((acc, controller) => {
acc.push(new controllers[controller](api, config.options));

return acc;
}, [] as AbstractController<AbstractService>[]);
Expand Down
41 changes: 17 additions & 24 deletions src/chains-config/kiltControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,23 @@ import { ControllerConfig } from '../types/chains-config';
* Controllers for KILT's mashnet.
*/
export const kiltControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksExtrinsics: true,
BlocksTrace: false,
AccountsAssets: false,
AccountsStakingPayouts: false,
AccountsBalanceInfo: true,
AccountsStakingInfo: true,
AccountsVestingInfo: false,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: false,
PalletsStakingProgress: false,
PalletsStorage: true,
Paras: false,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'AccountsBalanceInfo',
'AccountsStakingInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsStorage',
],
options: {
finalizes: true,
minCalcFeeRuntime: null,
Expand Down
40 changes: 16 additions & 24 deletions src/chains-config/kulupuControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
import { ControllerConfig } from '../types/chains-config';

export const kulupuControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksExtrinsics: true,
BlocksTrace: false,
AccountsAssets: false,
AccountsStakingPayouts: false,
AccountsBalanceInfo: true,
AccountsStakingInfo: false,
AccountsVestingInfo: false,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: false,
PalletsStakingProgress: false,
PalletsStorage: true,
Paras: false,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'AccountsBalanceInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsAssets',
],
options: {
finalizes: false,
minCalcFeeRuntime: null,
Expand Down
48 changes: 24 additions & 24 deletions src/chains-config/kusamaControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ import { getBlockWeight } from './metadata-consts';
* Kusama configuration for Sidecar.
*/
export const kusamaControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksExtrinsics: true,
BlocksTrace: true,
AccountsAssets: true,
AccountsStakingPayouts: true,
AccountsBalanceInfo: true,
AccountsStakingInfo: true,
AccountsVestingInfo: true,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: true,
PalletsStakingProgress: true,
PalletsStorage: true,
Paras: true,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'BlocksTrace',
'AccountsAssets',
'AccountsStakingPayouts',
'AccountsBalanceInfo',
'AccountsStakingInfo',
'AccountsVestingInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsAssets',
'PalletsStakingProgress',
'PalletsStorage',
'Paras',
],
options: {
finalizes: true,
minCalcFeeRuntime: 1062,
Expand Down
45 changes: 21 additions & 24 deletions src/chains-config/mandalaControllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,27 @@ import { ControllerConfig } from '../types/chains-config';
* Controllers for mandala, acala's test network.
*/
export const mandalaControllers: ControllerConfig = {
controllers: {
Blocks: true,
BlocksExtrinsics: true,
BlocksTrace: false,
AccountsAssets: false,
AccountsStakingPayouts: true,
AccountsBalanceInfo: true,
AccountsStakingInfo: true,
AccountsVestingInfo: true,
NodeNetwork: true,
NodeVersion: true,
NodeTransactionPool: true,
RuntimeCode: true,
RuntimeSpec: true,
RuntimeMetadata: true,
TransactionDryRun: true,
TransactionMaterial: true,
TransactionFeeEstimate: true,
TransactionSubmit: true,
PalletsAssets: false,
PalletsStakingProgress: true,
PalletsStorage: true,
Paras: true,
},
controllers: [
'Blocks',
'BlocksExtrinsics',
'AccountsStakingPayouts',
'AccountsBalanceInfo',
'AccountsStakingInfo',
'AccountsVestingInfo',
'NodeNetwork',
'NodeVersion',
'NodeTransactionPool',
'RuntimeCode',
'RuntimeSpec',
'RuntimeMetadata',
'TransactionDryRun',
'TransactionMaterial',
'TransactionFeeEstimate',
'TransactionSubmit',
'PalletsStakingProgress',
'PalletsStorage',
'Paras',
],
options: {
finalizes: true,
minCalcFeeRuntime: null,
Expand Down
Loading