Logger refactor

fetchai · Oct 3, 2024 · 20ab0f2 · 20ab0f2
1 parent f233445
commit 20ab0f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/app/app.go b/app/app.go
@@ -378,7 +378,7 @@ func New(
 
 	app.GovKeeper = *govKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(
-			// register the governance hooks
+		// register the governance hooks
 		),
 	)
 

diff --git a/app/upgrade_cudos.go b/app/upgrade_cudos.go
@@ -185,12 +185,12 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon
 		return fmt.Errorf("failed to withdraw genesis contracts balances: %w", err)
 	}
 
-	err = withdrawGenesisStakingDelegations(genesisData, cudosCfg, manifest)
+	err = withdrawGenesisStakingDelegations(app, genesisData, cudosCfg, manifest)
 	if err != nil {
 		return fmt.Errorf("failed to withdraw genesis staked tokens: %w", err)
 	}
 
-	err = withdrawGenesisDistributionRewards(genesisData, cudosCfg, manifest)
+	err = withdrawGenesisDistributionRewards(app, genesisData, cudosCfg, manifest)
 	if err != nil {
 		return fmt.Errorf("failed to withdraw genesis rewards: %w", err)
 	}
@@ -693,7 +693,7 @@ func parseGenesisValidators(jsonData map[string]interface{}) (*OrderedMap[string
 	return validatorInfoMap, nil
 }
 
-func withdrawGenesisStakingDelegations(genesisData *GenesisData, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest) error {
+func withdrawGenesisStakingDelegations(app *App, genesisData *GenesisData, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest) error {
 	// Handle delegations
 	for _, validatorOperatorAddress := range genesisData.validators.Keys() {
 		validator := genesisData.validators.MustGet(validatorOperatorAddress)
@@ -767,7 +767,7 @@ func withdrawGenesisStakingDelegations(genesisData *GenesisData, cudosCfg *Cudos
 		return fmt.Errorf("remaining bonded pool balance %s is too high", bondedPool.balance.String())
 	}
 
-	println("remaining bonded pool balance: ", bondedPool.balance.String())
+	app.Logger().Info("remaining bonded pool balance: ", bondedPool.balance.String())
 	err = moveGenesisBalance(genesisData, genesisData.bondedPoolAddress, cudosCfg.config.RemainingStakingBalanceAddr, bondedPool.balance, "remaining_bonded_pool_balance", manifest, cudosCfg)
 	if err != nil {
 		return err
@@ -782,7 +782,7 @@ func withdrawGenesisStakingDelegations(genesisData *GenesisData, cudosCfg *Cudos
 		return fmt.Errorf("remaining not-bonded pool balance %s is too high", notBondedPool.balance.String())
 	}
 
-	println("Remaining not-bonded pool balance: ", notBondedPool.balance.String())
+	app.Logger().Info("Remaining not-bonded pool balance: ", notBondedPool.balance.String())
 	err = moveGenesisBalance(genesisData, genesisData.notBondedPoolAddress, cudosCfg.config.RemainingStakingBalanceAddr, notBondedPool.balance, "remaining_not_bonded_pool_balance", manifest, cudosCfg)
 	if err != nil {
 		return err
@@ -1042,22 +1042,8 @@ func convertBalance(balance sdk.Coins, cudosCfg *CudosMergeConfig) (sdk.Coins, e
 			newAmount := coin.Amount.ToDec().Quo(conversionConstant).TruncateInt()
 			sdkCoin := sdk.NewCoin(cudosCfg.config.ConvertedDenom, newAmount)
 			resBalance = resBalance.Add(sdkCoin)
-		} else {
-			//println("Unknown denom: ", coin.Denom)
-			// Ignore unlisted tokens
-			continue
-			/*
-				// Just add without conversion
-				newAmount, ok := sdk.NewIntFromString(amount)
-				if !ok {
-					panic("failed to convert amount to big.Int")
-				}
-
-				sdkCoin := sdk.NewCoin(denom, newAmount)
-
-				resBalance = resBalance.Add(sdkCoin)
-			*/
 		}
+		// Denominations that are not in conversion constant map are ignored
 	}
 
 	return resBalance, nil

diff --git a/app/upgrade_cudos_distribution.go b/app/upgrade_cudos_distribution.go
@@ -355,7 +355,7 @@ func verifyOutstandingBalances(genesisData *GenesisData) error {
 	return nil
 }
 
-func withdrawGenesisDistributionRewards(genesisData *GenesisData, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest) error {
+func withdrawGenesisDistributionRewards(app *App, genesisData *GenesisData, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest) error {
 	// block height is used only to early stop rewards calculation
 	//blockHeight := getMaxBlockHeight(genesisData) + 1
 	blockHeight := uint64(math.MaxUint64)
@@ -370,7 +370,7 @@ func withdrawGenesisDistributionRewards(genesisData *GenesisData, cudosCfg *Cudo
 		for _, delegatorAddr := range delegatorStartInfo.Keys() {
 			delegation := validator.delegations.MustGet(delegatorAddr)
 
-			_, err := withdrawDelegationRewards(genesisData, validator, delegation, endingPeriod, blockHeight, cudosCfg, manifest)
+			_, err := withdrawDelegationRewards(app, genesisData, validator, delegation, endingPeriod, blockHeight, cudosCfg, manifest)
 			if err != nil {
 				return err
 			}
@@ -396,7 +396,7 @@ func withdrawGenesisDistributionRewards(genesisData *GenesisData, cudosCfg *Cudo
 
 	communityBalance, _ := genesisData.distributionInfo.feePool.communityPool.TruncateDecimal()
 	remainingBalance := distributionModuleAccount.balance.Sub(communityBalance)
-	println("Remaining dist balance: ", remainingBalance.String())
+	app.Logger().Info("Remaining dist balance: ", remainingBalance.String())
 
 	// TODO: Write to manifest?
 	err = checkTolerance(remainingBalance, maxToleratedRemainingDistributionBalance)
@@ -620,7 +620,7 @@ func (d DistributionInfo) GetDelegatorWithdrawAddr(delAddr string) string {
 	return b
 }
 
-func withdrawDelegationRewards(genesisData *GenesisData, val *ValidatorInfo, del *DelegationInfo, endingPeriod uint64, blockHeight uint64, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest) (sdk.Coins, error) {
+func withdrawDelegationRewards(app *App, genesisData *GenesisData, val *ValidatorInfo, del *DelegationInfo, endingPeriod uint64, blockHeight uint64, cudosCfg *CudosMergeConfig, manifest *UpgradeManifest) (sdk.Coins, error) {
 
 	// check existence of delegator starting info
 	genesisData.distributionInfo.delegatorStartingInfos.Has(val.operatorAddress)
@@ -641,7 +641,7 @@ func withdrawDelegationRewards(genesisData *GenesisData, val *ValidatorInfo, del
 	// of the decCoins due to operation order of the distribution mechanism.
 	rewards := rewardsRaw.Intersect(outstanding)
 	if !rewards.IsEqual(rewardsRaw) {
-		println(
+		app.Logger().Error(
 			"rounding error withdrawing rewards from validator",
 			"delegator", del.delegatorAddress,
 			"validator", val.operatorAddress,