fix: unappliedSlashesAtActiveEra in staking/progress (#1868)

* fix: unappliedSlashesAtActiveEra in staking/progress

* add check for slash empty & updated tests

Author: Imod7

src/services/pallets/PalletsStakingProgressService.spec.ts

@@ -60,7 +60,7 @@ const validatorsAt = () =>
 const forceEraAt = () => Promise.resolve().then(() => polkadotRegistry.createType('Forcing', 'NotForcing'));
 
 const unappliedSlashesEntries = () => {
-	return Promise.resolve([['5640', []]]);
+	return Promise.resolve([['5640', {}]]);
 };
 
 const validatorCountAt = () => Promise.resolve().then(() => polkadotRegistry.createType('u32', 197));
@@ -122,24 +122,22 @@ const mockApi = {
 	at: (_hash: Hash) => mockHistoricApi,
 } as unknown as ApiPromise;
 
-const unappliedSlashes = [
-	{
-		validator: '5CD2Q2EnKaKvjWza3ufMxaXizBTTDgm9kPB3DCZ4VA9j7Ud6',
-		own: '0',
-		others: [['5GxDBrTuFgCAN49xrpRFWJiA969R2Ny5NnTa8cSPBh8hWHY9', '6902377436592']],
-		reporters: [],
-		payout: '345118871829',
-		toJSON: function () {
-			return {
-				validator: this.validator,
-				own: this.own,
-				others: this.others.map(([account, amount]) => ({ account, amount })),
-				reporters: this.reporters,
-				payout: this.payout,
-			};
-		},
+const unappliedSlashes = {
+	validator: '5CD2Q2EnKaKvjWza3ufMxaXizBTTDgm9kPB3DCZ4VA9j7Ud6',
+	own: '0',
+	others: [['5GxDBrTuFgCAN49xrpRFWJiA969R2Ny5NnTa8cSPBh8hWHY9', '6902377436592']],
+	reporters: [],
+	payout: '345118871829',
+	toJSON: function () {
+		return {
+			validator: this.validator,
+			own: this.own,
+			others: this.others.map(([account, amount]) => ({ account, amount })),
+			reporters: this.reporters,
+			payout: this.payout,
+		};
 	},
-];
+};
 const unappliedSlashesEntriesUnappliedSlashes = () => {
 	return Promise.resolve([['5640', unappliedSlashes]]);
 };
@@ -477,6 +475,7 @@ describe('PalletStakingProgressService', () => {
 			const palletStakingProgressServiceUnappliedSlashes = new PalletsStakingProgressService('polkadot');
 
 			jest.spyOn(ApiPromiseRegistry, 'getApi').mockImplementation(() => mockApiUnappliedSlashes);
+
 			expect(
 				sanitizeNumbers(
 					await palletStakingProgressServiceUnappliedSlashes.derivePalletStakingProgress(blockHash789629),

src/services/pallets/PalletsStakingProgressService.ts

@@ -118,9 +118,12 @@ export class PalletsStakingProgressService extends AbstractService {
 			activeEra: activeEra.toString(10),
 			forceEra: forceEra.toJSON(),
 			nextSessionEstimate: nextSession.toString(10),
-			unappliedSlashes: unappliedSlashesAtActiveEra.toString()
-				? unappliedSlashesAtActiveEra[0][1].map((slash) => slash.toJSON())
-				: ([] as AnyJson[]),
+			unappliedSlashes:
+				Array.isArray(unappliedSlashesAtActiveEra) && unappliedSlashesAtActiveEra.length > 0
+					? unappliedSlashesAtActiveEra.map(([_key, slash]) =>
+							slash && Object.keys(slash).length > 0 ? slash.toJSON() : {},
+						)
+					: ([] as AnyJson[]),
 			validatorSet: validators && validators.length ? validators.map((accountId) => accountId.toString()) : [],
 		};
 

src/services/test-helpers/responses/pallets/stakingProgress789629.json

@@ -6,7 +6,7 @@
   "activeEra": "49",
   "forceEra": "NotForcing",
   "nextSessionEstimate": "791868",
-  "unappliedSlashes": [],
+  "unappliedSlashes": [{}],
   "nextActiveEraEstimate": "803868",
   "electionStatus": {
     "status": {

src/services/test-helpers/responses/pallets/stakingProgressPostAhm.json

@@ -6,7 +6,7 @@
     "activeEra": "49",
     "forceEra": "NotForcing",
     "nextSessionEstimate": "789999",
-    "unappliedSlashes": [],
+    "unappliedSlashes": [{}],
     "nextActiveEraEstimate": "-20369001",
     "electionStatus": {
       "status": {