fix(core-state): iterate over active delegates who have ranks (#4421)

ArkEcosystem · Jun 17, 2021 · d634a92 · d634a92
1 parent 76ecfe3
commit d634a92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/__tests__/unit/core-state/round-state.test.ts b/__tests__/unit/core-state/round-state.test.ts
@@ -623,6 +623,7 @@ describe("RoundState", () => {
 
             getDposPreviousRoundState.mockReturnValue({
                 getAllDelegates: jest.fn().mockReturnValue(delegates),
+                getActiveDelegates: jest.fn().mockReturnValue(delegates),
                 getRoundDelegates: jest.fn().mockReturnValue(delegates),
             });
 
@@ -659,6 +660,7 @@ describe("RoundState", () => {
 
             getDposPreviousRoundState.mockReturnValue({
                 getAllDelegates: jest.fn().mockReturnValue(delegates),
+                getActiveDelegates: jest.fn().mockReturnValue(delegates),
                 getRoundDelegates: jest.fn().mockReturnValue(delegates),
             });
 
@@ -797,6 +799,7 @@ describe("RoundState", () => {
 
             getDposPreviousRoundState.mockReturnValue({
                 getAllDelegates: jest.fn().mockReturnValue(delegates),
+                getActiveDelegates: jest.fn().mockReturnValue(delegates),
                 getRoundDelegates: jest.fn().mockReturnValue(delegates),
             });
 

diff --git a/packages/core-kernel/src/contracts/state/dpos.ts b/packages/core-kernel/src/contracts/state/dpos.ts
@@ -15,6 +15,7 @@ export interface DposState {
 
 export interface DposPreviousRoundState {
     getAllDelegates(): readonly Wallet[];
+    getActiveDelegates(): readonly Wallet[];
     getRoundDelegates(): readonly Wallet[];
 }
 

diff --git a/packages/core-state/src/dpos/dpos-previous-round.ts b/packages/core-state/src/dpos/dpos-previous-round.ts
@@ -33,6 +33,10 @@ export class DposPreviousRoundState implements Contracts.State.DposPreviousRound
         return this.dposState.getAllDelegates();
     }
 
+    public getActiveDelegates(): readonly Contracts.State.Wallet[] {
+        return this.dposState.getActiveDelegates();
+    }
+
     public getRoundDelegates(): readonly Contracts.State.Wallet[] {
         return this.dposState.getRoundDelegates();
     }

diff --git a/packages/core-state/src/round-state.ts b/packages/core-state/src/round-state.ts
@@ -273,7 +273,7 @@ export class RoundState {
         const prevRoundState = await this.getDposPreviousRoundState(blocks, roundInfo);
 
         // TODO: Move to Dpos
-        for (const prevRoundDelegateWallet of prevRoundState.getAllDelegates()) {
+        for (const prevRoundDelegateWallet of prevRoundState.getActiveDelegates()) {
             // ! name suggest that this is pure function
             // ! when in fact it is manipulating current wallet repository setting delegate ranks
             const username = prevRoundDelegateWallet.getAttribute("delegate.username");