Skip to content
This repository was archived by the owner on Mar 18, 2025. It is now read-only.

Commit b263ab9

Browse files
committed
remove code duplication from candidate
1 parent bf50d4b commit b263ab9

File tree

6 files changed

+261
-466
lines changed

6 files changed

+261
-466
lines changed

packages/common/src/constraints/CheckCandidates.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ export const checkCandidate = async (
144144
providerValid &&
145145
beefyValid;
146146

147-
await setValid(candidate.stash, valid);
147+
await setValid(candidate, valid);
148148

149149
if (valid) {
150-
await setLastValid(candidate.stash);
150+
await setLastValid(candidate);
151151
}
152152
return valid;
153153
} catch (e) {

packages/common/src/constraints/ValidityChecks.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ export const checkCommission = async (
260260
} commission is set higher than the maximum allowed. Set: ${
261261
commission / Math.pow(10, 7)
262262
}% Allowed: ${targetCommission / Math.pow(10, 7)}%`;
263-
await setCommissionInvalidity(candidate.stash, false, invalidityString);
263+
await setCommissionInvalidity(candidate, false, invalidityString);
264264
return false;
265265
} else {
266-
await setCommissionInvalidity(candidate.stash, true);
266+
await setCommissionInvalidity(candidate, true);
267267
return true;
268268
}
269269
} catch (e) {
@@ -285,7 +285,7 @@ export const checkSelfStake = async (
285285
let invalidityString;
286286
if (err2) {
287287
invalidityString = `${candidate.name} ${err2}`;
288-
await setSelfStakeInvalidity(candidate.stash, false, invalidityString);
288+
await setSelfStakeInvalidity(candidate, false, invalidityString);
289289
return false;
290290
}
291291
if (parseInt(bondedAmt.toString()) < targetSelfStake) {
@@ -294,11 +294,11 @@ export const checkSelfStake = async (
294294
} has less than the minimum amount bonded: ${parseInt(
295295
bondedAmt.toString(),
296296
)} is bonded.`;
297-
await setSelfStakeInvalidity(candidate.stash, false, invalidityString);
297+
await setSelfStakeInvalidity(candidate, false, invalidityString);
298298
return false;
299299
}
300300
}
301-
await setSelfStakeInvalidity(candidate.stash, true);
301+
await setSelfStakeInvalidity(candidate, true);
302302
return true;
303303
} catch (e) {
304304
logger.error(`Error checking self stake: ${e}`, constraintsLabel);
@@ -322,10 +322,10 @@ export const checkUnclaimed = async (
322322
const invalidityString = `${candidate.name} has unclaimed eras: ${
323323
candidate.unclaimedEras
324324
} prior to era: ${threshold + 1}`;
325-
await setUnclaimedInvalidity(candidate.stash, false, invalidityString);
325+
await setUnclaimedInvalidity(candidate, false, invalidityString);
326326
return false;
327327
} else {
328-
await setUnclaimedInvalidity(candidate.stash, true);
328+
await setUnclaimedInvalidity(candidate, true);
329329
return true;
330330
}
331331
} catch (e) {
@@ -343,10 +343,10 @@ export const checkBlocked = async (
343343
const isBlocked = await chaindata.getBlocked(candidate.stash);
344344
if (isBlocked) {
345345
const invalidityString = `${candidate.name} blocks external nominations`;
346-
await setBlockedInvalidity(candidate.stash, false, invalidityString);
346+
await setBlockedInvalidity(candidate, false, invalidityString);
347347
return false;
348348
} else {
349-
await setBlockedInvalidity(candidate.stash, true);
349+
await setBlockedInvalidity(candidate, true);
350350
return true;
351351
}
352352
} catch (e) {
@@ -375,14 +375,14 @@ export const checkProvider = async (
375375
label: "Constraints",
376376
},
377377
);
378-
await setProviderInvalidity(candidate.stash, false);
378+
await setProviderInvalidity(candidate, false);
379379
return false;
380380
} else {
381-
await setProviderInvalidity(candidate.stash, true);
381+
await setProviderInvalidity(candidate, true);
382382
return true;
383383
}
384384
} else {
385-
await setProviderInvalidity(candidate.stash, true);
385+
await setProviderInvalidity(candidate, true);
386386
return true;
387387
}
388388
} catch (e) {
@@ -402,17 +402,17 @@ export const checkKusamaRank = async (
402402

403403
if (!!res.data.invalidityReasons) {
404404
const invalidityReason = `${candidate.name} has a kusama node that is invalid: ${res.data.invalidityReasons}`;
405-
await setKusamaRankInvalidity(candidate.stash, false, invalidityReason);
405+
await setKusamaRankInvalidity(candidate, false, invalidityReason);
406406
return false;
407407
}
408408

409409
if (Number(res.data.rank) < Constants.KUSAMA_RANK_VALID_THRESHOLD) {
410410
const invalidityReason = `${candidate.name} has a Kusama stash with lower than 25 rank in the Kusama OTV programme: ${res.data.rank}.`;
411-
await setKusamaRankInvalidity(candidate.stash, false, invalidityReason);
411+
await setKusamaRankInvalidity(candidate, false, invalidityReason);
412412
return false;
413413
}
414414
}
415-
await setKusamaRankInvalidity(candidate.stash, true);
415+
await setKusamaRankInvalidity(candidate, true);
416416
return true;
417417
} catch (e) {
418418
logger.warn(`Error trying to get kusama data...`);
@@ -427,10 +427,10 @@ export const checkBeefyKeys = async (
427427
const isDummy = await queries.hasBeefyDummy(candidate.stash);
428428
if (isDummy) {
429429
const invalidityString = `${candidate.name} has not set beefy keys`;
430-
await setBeefyKeysInvalidity(candidate.stash, false, invalidityString);
430+
await setBeefyKeysInvalidity(candidate, false, invalidityString);
431431
return false;
432432
} else {
433-
await setBeefyKeysInvalidity(candidate.stash, true);
433+
await setBeefyKeysInvalidity(candidate, true);
434434
return true;
435435
}
436436
} catch (e) {

0 commit comments

Comments
 (0)