- fix after review: minor renaming

multiversx · Apr 27, 2021 · 5b24b8e · 5b24b8e
1 parent b25b143
commit 5b24b8e
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 49 deletions.
diff --git a/integrationTests/vm/testInitializer.go b/integrationTests/vm/testInitializer.go
@@ -71,7 +71,7 @@ type ArgEnableEpoch struct {
 	DeployEnableEpoch              uint32
 	MetaProtectionEnableEpoch      uint32
 	RelayedTxEnableEpoch           uint32
-	UnbondTokensV2                 uint32
+	UnbondTokensV2EnableEpoch      uint32
 }
 
 // VMTestContext -
@@ -543,7 +543,7 @@ func createSystemSCConfig(arg ArgEnableEpoch) *config.SystemSmartContractsConfig
 			StakeEnableEpoch:                     0,
 			DoubleKeyProtectionEnableEpoch:       0,
 			ActivateBLSPubKeyMessageVerification: false,
-			UnbondTokensV2EnableEpoch:            arg.UnbondTokensV2,
+			UnbondTokensV2EnableEpoch:            arg.UnbondTokensV2EnableEpoch,
 		},
 		DelegationManagerSystemSCConfig: config.DelegationManagerSystemSCConfig{
 			MinCreationDeposit:  "1250000000000000000000",

diff --git a/integrationTests/vm/txsFee/validatorSC_test.go b/integrationTests/vm/txsFee/validatorSC_test.go
@@ -131,12 +131,12 @@ func TestValidatorsSC_DoStakePutInQueueUnStakeAndUnBondTokensShouldRefund(t *tes
 
 func TestValidatorsSC_DoStakeWithTopUpValueTryToUnStakeTokensAndUnBondTokens(t *testing.T) {
 	argUnbondTokensV1 := vm.ArgEnableEpoch{
-		UnbondTokensV2: 20000,
+		UnbondTokensV2EnableEpoch: 20000,
 	}
 	testValidatorsSC_DoStakeWithTopUpValueTryToUnStakeTokensAndUnBondTokens(t, argUnbondTokensV1)
 
 	argUnbondTokensV2 := vm.ArgEnableEpoch{
-		UnbondTokensV2: 0,
+		UnbondTokensV2EnableEpoch: 0,
 	}
 	testValidatorsSC_DoStakeWithTopUpValueTryToUnStakeTokensAndUnBondTokens(t, argUnbondTokensV2)
 }

diff --git a/vm/systemSmartContracts/validator.go b/vm/systemSmartContracts/validator.go
@@ -32,31 +32,31 @@ const (
 )
 
 type validatorSC struct {
-	eei                      vm.SystemEI
-	unBondPeriod             uint64
-	unBondPeriodInEpochs     uint32
-	sigVerifier              vm.MessageSignVerifier
-	baseConfig               ValidatorConfig
-	stakingV2Epoch           uint32
-	stakingSCAddress         []byte
-	validatorSCAddress       []byte
-	walletAddressLen         int
-	enableStakingEpoch       uint32
-	enableDoubleKeyEpoch     uint32
-	gasCost                  vm.GasCost
-	marshalizer              marshal.Marshalizer
-	flagEnableStaking        atomic.Flag
-	flagEnableTopUp          atomic.Flag
-	flagDoubleKey            atomic.Flag
-	minUnstakeTokensValue    *big.Int
-	minDeposit               *big.Int
-	mutExecution             sync.RWMutex
-	endOfEpochAddress        []byte
-	enableDelegationMgrEpoch uint32
-	enableUnbondTokensV2     uint32
-	delegationMgrSCAddress   []byte
-	flagDelegationMgr        atomic.Flag
-	flagUnbondTokensV2       atomic.Flag
+	eei                       vm.SystemEI
+	unBondPeriod              uint64
+	unBondPeriodInEpochs      uint32
+	sigVerifier               vm.MessageSignVerifier
+	baseConfig                ValidatorConfig
+	stakingV2Epoch            uint32
+	stakingSCAddress          []byte
+	validatorSCAddress        []byte
+	walletAddressLen          int
+	enableStakingEpoch        uint32
+	enableDoubleKeyEpoch      uint32
+	gasCost                   vm.GasCost
+	marshalizer               marshal.Marshalizer
+	flagEnableStaking         atomic.Flag
+	flagEnableTopUp           atomic.Flag
+	flagDoubleKey             atomic.Flag
+	minUnstakeTokensValue     *big.Int
+	minDeposit                *big.Int
+	mutExecution              sync.RWMutex
+	endOfEpochAddress         []byte
+	enableDelegationMgrEpoch  uint32
+	enableUnbondTokensV2Epoch uint32
+	delegationMgrSCAddress    []byte
+	flagDelegationMgr         atomic.Flag
+	flagUnbondTokensV2        atomic.Flag
 }
 
 // ArgsValidatorSmartContract is the arguments structure to create a new ValidatorSmartContract
@@ -139,25 +139,25 @@ func NewValidatorSmartContract(
 	}
 
 	reg := &validatorSC{
-		eei:                      args.Eei,
-		unBondPeriod:             args.StakingSCConfig.UnBondPeriod,
-		unBondPeriodInEpochs:     args.StakingSCConfig.UnBondPeriodInEpochs,
-		sigVerifier:              args.SigVerifier,
-		baseConfig:               baseConfig,
-		stakingV2Epoch:           args.StakingSCConfig.StakingV2Epoch,
-		enableStakingEpoch:       args.StakingSCConfig.StakeEnableEpoch,
-		stakingSCAddress:         args.StakingSCAddress,
-		validatorSCAddress:       args.ValidatorSCAddress,
-		gasCost:                  args.GasCost,
-		marshalizer:              args.Marshalizer,
-		minUnstakeTokensValue:    minUnstakeTokensValue,
-		walletAddressLen:         len(args.ValidatorSCAddress),
-		enableDoubleKeyEpoch:     args.StakingSCConfig.DoubleKeyProtectionEnableEpoch,
-		endOfEpochAddress:        args.EndOfEpochAddress,
-		minDeposit:               minDeposit,
-		enableDelegationMgrEpoch: args.DelegationMgrEnableEpoch,
-		delegationMgrSCAddress:   args.DelegationMgrSCAddress,
-		enableUnbondTokensV2:     args.StakingSCConfig.UnbondTokensV2EnableEpoch,
+		eei:                       args.Eei,
+		unBondPeriod:              args.StakingSCConfig.UnBondPeriod,
+		unBondPeriodInEpochs:      args.StakingSCConfig.UnBondPeriodInEpochs,
+		sigVerifier:               args.SigVerifier,
+		baseConfig:                baseConfig,
+		stakingV2Epoch:            args.StakingSCConfig.StakingV2Epoch,
+		enableStakingEpoch:        args.StakingSCConfig.StakeEnableEpoch,
+		stakingSCAddress:          args.StakingSCAddress,
+		validatorSCAddress:        args.ValidatorSCAddress,
+		gasCost:                   args.GasCost,
+		marshalizer:               args.Marshalizer,
+		minUnstakeTokensValue:     minUnstakeTokensValue,
+		walletAddressLen:          len(args.ValidatorSCAddress),
+		enableDoubleKeyEpoch:      args.StakingSCConfig.DoubleKeyProtectionEnableEpoch,
+		endOfEpochAddress:         args.EndOfEpochAddress,
+		minDeposit:                minDeposit,
+		enableDelegationMgrEpoch:  args.DelegationMgrEnableEpoch,
+		delegationMgrSCAddress:    args.DelegationMgrSCAddress,
+		enableUnbondTokensV2Epoch: args.StakingSCConfig.UnbondTokensV2EnableEpoch,
 	}
 
 	args.EpochNotifier.RegisterNotifyHandler(reg)
@@ -1916,7 +1916,7 @@ func (v *validatorSC) EpochConfirmed(epoch uint32) {
 	v.flagDelegationMgr.Toggle(epoch >= v.enableDelegationMgrEpoch)
 	log.Debug("validatorSC: delegation manager", "enabled", v.flagDelegationMgr.IsSet())
 
-	v.flagUnbondTokensV2.Toggle(epoch >= v.enableUnbondTokensV2)
+	v.flagUnbondTokensV2.Toggle(epoch >= v.enableUnbondTokensV2Epoch)
 	log.Debug("validatorSC: unbond tokens v2", "enabled", v.flagUnbondTokensV2.IsSet())
 }