From 15c6e060fcc84d301499aa202692ab15945fda4d Mon Sep 17 00:00:00 2001
From: Bourne Zhang <bournezhang@snapchain.dev>
Date: Wed, 28 Aug 2024 12:18:48 +0800
Subject: [PATCH] refactor QueryFinalityProviderHasPower

---
 clientcontroller/opstackl2/consumer.go | 32 +++++++-------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/clientcontroller/opstackl2/consumer.go b/clientcontroller/opstackl2/consumer.go
index fa726881..e25ecc3b 100644
--- a/clientcontroller/opstackl2/consumer.go
+++ b/clientcontroller/opstackl2/consumer.go
@@ -267,49 +267,33 @@ func (cc *OPStackL2ConsumerController) SubmitBatchFinalitySigs(
 // TODO: see this issue https://github.com/babylonlabs-io/finality-provider/issues/390 for more details
 func (cc *OPStackL2ConsumerController) QueryFinalityProviderHasPower(fpPk *btcec.PublicKey, blockHeight uint64) (bool, error) {
 	fpBtcPkHex := bbntypes.NewBIP340PubKeyFromBTCPK(fpPk).MarshalHex()
-	var nextKey []byte = nil
+	var nextKey []byte
 
-	hasActiveDelegation := false
 	for {
-		pagination := &sdkquerytypes.PageRequest{
-			Key:   nextKey,
-			Limit: 100,
-		}
-		// queries the BTCStaking module for all delegations of a finality provider
-		resp, err := cc.bbnClient.QueryClient.FinalityProviderDelegations(fpBtcPkHex, pagination)
+		resp, err := cc.bbnClient.QueryClient.FinalityProviderDelegations(fpBtcPkHex, &sdkquerytypes.PageRequest{Key: nextKey, Limit: 100})
 		if err != nil {
 			return false, err
 		}
+
 		for _, btcDels := range resp.BtcDelegatorDelegations {
-			// early return if the delegation is active
-			if hasActiveDelegation {
-				break
-			}
 			for _, btcDel := range btcDels.Dels {
-				activate, delErr := cc.isDelegationActive(btcDel)
-				if delErr != nil {
+				active, err := cc.isDelegationActive(btcDel)
+				if err != nil {
 					continue
 				}
-				if activate {
-					hasActiveDelegation = true
-					break
+				if active {
+					return true, nil
 				}
 			}
 		}
 
-		// early return if the delegation is active
-		if hasActiveDelegation {
-			break
-		}
-
 		if resp.Pagination == nil || resp.Pagination.NextKey == nil {
 			break
 		}
 		nextKey = resp.Pagination.NextKey
 	}
 
-	return hasActiveDelegation, nil
-
+	return false, nil
 }
 
 // QueryLatestFinalizedBlock returns the finalized L2 block from a RPC call