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

Clean Config Leftovers #2864

Open
wants to merge 3 commits into
base: staging
Choose a base branch
from
Open

Clean Config Leftovers #2864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50b98e3
lint
Apr 12, 2024
e8e6a05
remove old unused config options
Apr 12, 2024
bb2a4fd
Merge branch 'staging' into will-clean-config-leftovers
ironoa May 15, 2024
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
19 changes: 1 addition & 18 deletions docs/docs/backend/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,6 @@ An example config may look something like:
"country": "10",
"provider": "100",
"nominations": "100",
"delegations": "60",
"openGov": "100",
"openGovDelegation": "100",
"rpc": "100",
"client": "100",
"useInclusion": true,
Expand All @@ -215,9 +212,6 @@ An example config may look something like:
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down Expand Up @@ -494,12 +488,7 @@ An example `core` config run as microservices may look something like:
"region": "10",
"country": "10",
"provider": "100",
"council": "50",
"democracy": "100",
"nominations": "100",
"delegations": "60",
"openGov": "100",
"openGovDelegation": "100"
"nominations": "100"
},
"scorekeeper": {
"forceRound": false,
Expand Down Expand Up @@ -614,9 +603,6 @@ An example Worker config run as microservices may look something like:
"country": "10",
"provider": "100",
"nominations": "100",
"delegations": "60",
"openGov": "100",
"openGovDelegation": "100",
"rpc": "100",
"client": "100",
"useInclusion": true,
Expand All @@ -632,9 +618,6 @@ An example Worker config run as microservices may look something like:
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
5 changes: 1 addition & 4 deletions helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,7 @@ config: |
"region": "10",
"country": "10",
"provider": "50",
"council": "50",
"democracy": "100",
"nominations": "100",
"delegations": "60"
"nominations": "100"
},
"scorekeeper": {
"forceRound": false,
Expand Down
5 changes: 1 addition & 4 deletions helmfile.d/config/kusama/otv-backend-local.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,7 @@ config: |
"region": "10",
"country": "10",
"provider": "50",
"council": "50",
"democracy": "100",
"nominations": "100",
"delegations": "60"
"nominations": "100"
},
"scorekeeper": {
"candidates": [
Expand Down
5 changes: 1 addition & 4 deletions helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ config: |
"region": "10",
"country": "10",
"provider": "50",
"council": "50",
"democracy": "100",
"nominations": "100",
"delegations": "60"
"nominations": "100"
},
"scorekeeper": {
"forceRound": true,
Expand Down
5 changes: 1 addition & 4 deletions helmfile.d/config/polkadot/otv-backend-local.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ config: |
"region": "10",
"country": "10",
"provider": "50",
"council": "50",
"democracy": "100",
"nominations": "100",
"delegations": "60"
"nominations": "100"
},
"scorekeeper": {
"candidates": [
Expand Down
6 changes: 0 additions & 6 deletions packages/common/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ export type ConfigSchema = {
country: number | 0;
provider: number | 0;
nominations: number | 0;
delegations: number | 0;
openGov: number | 0;
openGovDelegation: number | 0;
rpc: number | 0;
client: number | 0;
useInclusion: boolean;
Expand All @@ -139,9 +136,6 @@ export type ConfigSchema = {
useCountry: boolean;
useProvider: boolean;
useNominations: boolean;
useDelegations: boolean;
useOpenGov: boolean;
useOpenGovDelegation: boolean;
useRpc: boolean;
useClient: boolean;
};
Expand Down
75 changes: 0 additions & 75 deletions packages/common/src/db/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,19 +583,9 @@ export interface ValidatorScoreMetadata {
countryWeight: number;
providerStats: LStats;
providerWeight: number;
councilStakeWeight?: number;
councilStakeStats?: Stats;
democracyStats?: Stats;
democracyWeight?: number;
nominatorStakeStats?: Stats;
nominatorStakeWeight: number;
delegationStats?: Stats;
delegationWeight?: number;
openGovStats?: Stats;
openGovDelegationWeight?: number;
openGovDelegationStats?: Stats;
faultsWeight?: number;
openGovWeight?: number;
rpcWeight?: number;
clientWeight?: number;
updated?: number;
Expand Down Expand Up @@ -856,32 +846,6 @@ export const ValidatorScoreMetadataSchema = new Schema({
standardDeviation: Number,
},
providerWeight: Number,
councilStakeWeight: Number,
councilStakeStats: {
values: [Number],
absoluteMin: Number,
absoluteMax: Number,
q10: Number,
q25: Number,
q50: Number,
q75: Number,
q90: Number,
mean: Number,
standardDeviation: Number,
},
democracyStats: {
values: [Number],
absoluteMin: Number,
absoluteMax: Number,
q10: Number,
q25: Number,
q50: Number,
q75: Number,
q90: Number,
mean: Number,
standardDeviation: Number,
},
democracyWeight: Number,
nominatorStakeStats: {
values: [Number],
absoluteMin: Number,
Expand All @@ -895,45 +859,6 @@ export const ValidatorScoreMetadataSchema = new Schema({
standardDeviation: Number,
},
nominatorStakeWeight: Number,
delegationStats: {
values: [Number],
absoluteMin: Number,
absoluteMax: Number,
q10: Number,
q25: Number,
q50: Number,
q75: Number,
q90: Number,
mean: Number,
standardDeviation: Number,
},
delegationWeight: Number,
openGovStats: {
values: [Number],
absoluteMin: Number,
absoluteMax: Number,
q10: Number,
q25: Number,
q50: Number,
q75: Number,
q90: Number,
mean: Number,
standardDeviation: Number,
},
openGovDelegationWeight: Number,
openGovDelegationStats: {
values: [Number],
absoluteMin: Number,
absoluteMax: Number,
q10: Number,
q25: Number,
q50: Number,
q75: Number,
q90: Number,
mean: Number,
standardDeviation: Number,
},
openGovWeight: Number,
// The last time one was updated
updated: Number,
});
Expand Down
12 changes: 0 additions & 12 deletions packages/common/src/db/queries/ValidatorScoreMetadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ export const setValidatorScoreMetadata = async (
providerWeight,
nominatorStakeStats,
nominatorStakeWeight,
openGovStats,
openGovWeight,
openGovDelegationStats,
openGovDelegationWeight,
} = scoreMetadata;

const data = await ValidatorScoreMetadataModel.findOne({
Expand Down Expand Up @@ -77,10 +73,6 @@ export const setValidatorScoreMetadata = async (
providerWeight,
nominatorStakeStats,
nominatorStakeWeight,
openGovStats,
openGovWeight,
openGovDelegationStats,
openGovDelegationWeight,
updated,
});
await validatorScoreMetadata.save();
Expand Down Expand Up @@ -122,10 +114,6 @@ export const setValidatorScoreMetadata = async (
providerWeight,
nominatorStakeStats,
nominatorStakeWeight,
openGovStats,
openGovWeight,
openGovDelegationStats,
openGovDelegationWeight,
updated,
},
).exec();
Expand Down
5 changes: 0 additions & 5 deletions packages/core/config/kusama.current.dev.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
"unclaimedEras": "0 0-59/1 * * * *",
"validatorPref": "0 0-59/1 * * * *",
"nominator": "0 0-59/1 * * * *",
"delegation": "0 0-59/1 * * * *",
"democracy": "0 0-59/1 * * * *",
"monitorEnabled": true,
"clearOfflineEnabled": true,
"validityEnabled": true,
Expand Down Expand Up @@ -111,9 +109,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
3 changes: 0 additions & 3 deletions packages/core/config/kusama.current.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
3 changes: 0 additions & 3 deletions packages/core/config/kusama.microservice.dev.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
5 changes: 1 addition & 4 deletions packages/core/config/main.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,7 @@
"region": "10",
"country": "10",
"provider": "50",
"council": "50",
"democracy": "100",
"nominations": "100",
"delegations": "60"
"nominations": "100"
},
"scorekeeper": {
"candidates": [
Expand Down
3 changes: 0 additions & 3 deletions packages/core/config/polkadot.current.dev.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
3 changes: 0 additions & 3 deletions packages/core/config/polkadot.current.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
3 changes: 0 additions & 3 deletions packages/core/config/polkadot.microservice.dev.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
3 changes: 0 additions & 3 deletions packages/core/config/polkadot.microservice.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
6 changes: 0 additions & 6 deletions packages/worker/config/kusama.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"country": "10",
"provider": "100",
"nominations": "100",
"delegations": "60",
"openGov": "100",
"openGovDelegation": "100",
"rpc": "100",
"client": "100",
"useInclusion": true,
Expand All @@ -47,9 +44,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down
6 changes: 0 additions & 6 deletions packages/worker/config/polkadot.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
"country": "10",
"provider": "100",
"nominations": "100",
"delegations": "60",
"openGov": "100",
"openGovDelegation": "100",
"rpc": "100",
"client": "100",
"useInclusion": true,
Expand All @@ -45,9 +42,6 @@
"useCountry": true,
"useProvider": true,
"useNominations": true,
"useDelegations": true,
"useOpenGov": true,
"useOpenGovDelegation": true,
"useRpc": true,
"useClient": true
},
Expand Down