Simplify expressions (#8370)

farazdagi · prylabs-bulldozer[bot] · web-flow · commit d53fdcf7811b · 2021-02-01T15:14:36.000Z
* Simplify expressions

* avoid escaping

Co-authored-by: prylabs-bulldozer[bot] &lt;58059840+prylabs-bulldozer[bot]@users.noreply.github.com&gt;
diff --git a/beacon-chain/core/epoch/precompute/reward_penalty_test.go b/beacon-chain/core/epoch/precompute/reward_penalty_test.go
@@ -91,7 +91,7 @@ func TestAttestationDeltaPrecompute(t *testing.T) {
 
 	// Add some variances to target and head balances.
 	// See: https://github.com/prysmaticlabs/prysm/issues/5593
-	bp.PrevEpochTargetAttested = bp.PrevEpochTargetAttested / 2
+	bp.PrevEpochTargetAttested /= 2
 	bp.PrevEpochHeadAttested = bp.PrevEpochHeadAttested * 2 / 3
 	rewards, penalties, err := AttestationsDelta(beaconState, bp, vp)
 	require.NoError(t, err)
diff --git a/beacon-chain/core/helpers/slot_epoch.go b/beacon-chain/core/helpers/slot_epoch.go
@@ -213,7 +213,7 @@ func WeakSubjectivityCheckptEpoch(valCount uint64) (uint64, error) {
 		if err != nil {
 			return 0, err
 		}
-		v = v / (2 * 100 * m)
+		v /= 2 * 100 * m
 		wsp += v
 	}
 	return wsp, nil
diff --git a/beacon-chain/powchain/log_processing.go b/beacon-chain/powchain/log_processing.go
@@ -318,7 +318,7 @@ func (s *Service) processPastLogs(ctx context.Context) error {
 				}
 
 				// multiplicative decrease
-				batchSize = batchSize / multiplicativeDecreaseDivisor
+				batchSize /= multiplicativeDecreaseDivisor
 				continue
 			}
 			return err
@@ -351,7 +351,7 @@ func (s *Service) processPastLogs(ctx context.Context) error {
 
 		if batchSize < s.eth1HeaderReqLimit {
 			// update the batchSize with additive increase
-			batchSize = batchSize + additiveFactor
+			batchSize += additiveFactor
 			if batchSize > s.eth1HeaderReqLimit {
 				batchSize = s.eth1HeaderReqLimit
 			}
diff --git a/beacon-chain/rpc/validator/attester_test.go b/beacon-chain/rpc/validator/attester_test.go
@@ -208,7 +208,7 @@ func TestAttestationDataAtSlot_HandlesFarAwayJustifiedEpoch(t *testing.T) {
 	justifiedBlock := testutil.NewBeaconBlock()
 	justifiedBlock.Block.Slot, err = helpers.StartSlot(helpers.SlotToEpoch(1500))
 	require.NoError(t, err)
-	justifiedBlock.Block.Slot = justifiedBlock.Block.Slot - 2 // Imagine two skip block
+	justifiedBlock.Block.Slot -= 2 // Imagine two skip block
 	blockRoot, err := block.Block.HashTreeRoot()
 	require.NoError(t, err, "Could not hash beacon block")
 	justifiedBlockRoot, err := justifiedBlock.Block.HashTreeRoot()
diff --git a/shared/params/loader.go b/shared/params/loader.go
@@ -51,7 +51,7 @@ func replaceHexStringWithYAMLFormat(line string) []string {
 		if err != nil {
 			log.WithError(err).Error("Failed to marshal config file.")
 		}
-		parts[0] = parts[0] + string(fixedByte)
+		parts[0] += string(fixedByte)
 		parts = parts[:1]
 	case l > 1 && l <= 4:
 		var arr [4]byte
diff --git a/validator/accounts/accounts_import.go b/validator/accounts/accounts_import.go
@@ -27,7 +27,7 @@ import (
 	keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4"
 )
 
-var derivationPathRegex = regexp.MustCompile("m_12381_3600_([0-9]+)_([0-9]+)_([0-9]+)")
+var derivationPathRegex = regexp.MustCompile(`m_12381_3600_(\d+)_(\d+)_(\d+)`)
 
 // byDerivationPath implements sort.Interface based on a
 // derivation path present in a keystore filename, if any. This

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func WeakSubjectivityCheckptEpoch(valCount uint64) (uint64, error) {`
`213`	`213`	`if err != nil {`
`214`	`214`	`return 0, err`
`215`	`215`	`}`
`216`		`- v = v / (2 * 100 * m)`
	`216`	`+ v /= 2 * 100 * m`
`217`	`217`	`wsp += v`
`218`	`218`	`}`
`219`	`219`	`return wsp, nil`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ func (s *Service) processPastLogs(ctx context.Context) error {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`// multiplicative decrease`
`321`		`- batchSize = batchSize / multiplicativeDecreaseDivisor`
	`321`	`+ batchSize /= multiplicativeDecreaseDivisor`
`322`	`322`	`continue`
`323`	`323`	`}`
`324`	`324`	`return err`
`@@ -351,7 +351,7 @@ func (s *Service) processPastLogs(ctx context.Context) error {`
`351`	`351`
`352`	`352`	`if batchSize < s.eth1HeaderReqLimit {`
`353`	`353`	`// update the batchSize with additive increase`
`354`		`- batchSize = batchSize + additiveFactor`
	`354`	`+ batchSize += additiveFactor`
`355`	`355`	`if batchSize > s.eth1HeaderReqLimit {`
`356`	`356`	`batchSize = s.eth1HeaderReqLimit`
`357`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func replaceHexStringWithYAMLFormat(line string) []string {`
`51`	`51`	`if err != nil {`
`52`	`52`	`log.WithError(err).Error("Failed to marshal config file.")`
`53`	`53`	`}`
`54`		`- parts[0] = parts[0] + string(fixedByte)`
	`54`	`+ parts[0] += string(fixedByte)`
`55`	`55`	`parts = parts[:1]`
`56`	`56`	`case l > 1 && l <= 4:`
`57`	`57`	`var arr [4]byte`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var derivationPathRegex = regexp.MustCompile("m_12381_3600_([0-9]+)_([0-9]+)_([0-9]+)")`
	`30`	+var derivationPathRegex = regexp.MustCompile(`m_12381_3600_(\d+)_(\d+)_(\d+)`)
`31`	`31`
`32`	`32`	`// byDerivationPath implements sort.Interface based on a`
`33`	`33`	`// derivation path present in a keystore filename, if any. This`