core/types: using testing.B.Loop

Author: cuiweixie

core/types/block_test.go

@@ -264,8 +264,7 @@ var benchBuffer = bytes.NewBuffer(make([]byte, 0, 32000))
 func BenchmarkEncodeBlock(b *testing.B) {
 	block := makeBenchBlock()
 	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		benchBuffer.Reset()
 		if err := rlp.Encode(benchBuffer, block); err != nil {
 			b.Fatal(err)

core/types/bloom9_test.go

@@ -78,15 +78,15 @@ func TestBloomExtensively(t *testing.T) {
 
 func BenchmarkBloom9(b *testing.B) {
 	test := []byte("testestestest")
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		Bloom9(test)
 	}
 }
 
 func BenchmarkBloom9Lookup(b *testing.B) {
 	toTest := []byte("testtest")
 	bloom := new(Bloom)
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		bloom.Test(toTest)
 	}
 }
@@ -128,7 +128,7 @@ func BenchmarkCreateBloom(b *testing.B) {
 	}
 	b.Run("small-createbloom", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			for _, receipt := range rSmall {
 				receipt.Bloom = CreateBloom(receipt)
 			}
@@ -144,7 +144,7 @@ func BenchmarkCreateBloom(b *testing.B) {
 	})
 	b.Run("large-createbloom", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			for _, receipt := range rLarge {
 				receipt.Bloom = CreateBloom(receipt)
 			}
@@ -166,7 +166,7 @@ func BenchmarkCreateBloom(b *testing.B) {
 		b.ResetTimer()
 
 		var bl Bloom
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			bl = MergeBloom(rSmall)
 		}
 		b.StopTimer()
@@ -185,7 +185,7 @@ func BenchmarkCreateBloom(b *testing.B) {
 		b.ResetTimer()
 
 		var bl Bloom
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			bl = MergeBloom(rLarge)
 		}
 		b.StopTimer()

core/types/hashing_test.go

@@ -86,15 +86,15 @@ func BenchmarkDeriveSha200(b *testing.B) {
 	b.Run("std_trie", func(b *testing.B) {
 		b.ResetTimer()
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			exp = types.DeriveSha(txs, trie.NewEmpty(triedb.NewDatabase(rawdb.NewMemoryDatabase(), nil)))
 		}
 	})
 
 	b.Run("stack_trie", func(b *testing.B) {
 		b.ResetTimer()
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			got = types.DeriveSha(txs, trie.NewStackTrie(nil))
 		}
 	})

core/types/transaction_test.go

@@ -591,7 +591,7 @@ func BenchmarkHash(b *testing.B) {
 		GasTipCap: big.NewInt(500),
 		GasFeeCap: big.NewInt(500),
 	})
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		signer.Hash(tx)
 	}
 }
@@ -614,7 +614,7 @@ func BenchmarkEffectiveGasTip(b *testing.B) {
 
 	b.Run("Original", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			_, err := tx.EffectiveGasTip(baseFee.ToBig())
 			if err != nil {
 				b.Fatal(err)
@@ -625,7 +625,7 @@ func BenchmarkEffectiveGasTip(b *testing.B) {
 	b.Run("IntoMethod", func(b *testing.B) {
 		b.ReportAllocs()
 		dst := new(uint256.Int)
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			err := tx.calcEffectiveGasTip(dst, baseFee)
 			if err != nil {
 				b.Fatal(err)
@@ -729,7 +729,7 @@ func BenchmarkEffectiveGasTipCmp(b *testing.B) {
 
 	b.Run("Original", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			tx.EffectiveGasTipCmp(other, baseFee)
 		}
 	})

core/types/types_test.go

@@ -126,7 +126,7 @@ func benchRLP(b *testing.B, encode bool) {
 			b.Run(tc.name, func(b *testing.B) {
 				b.ReportAllocs()
 				var null = &devnull{}
-				for i := 0; i < b.N; i++ {
+				for b.Loop() {
 					rlp.Encode(null, tc.obj)
 				}
 				b.SetBytes(int64(null.len / b.N))
@@ -136,7 +136,7 @@ func benchRLP(b *testing.B, encode bool) {
 			// Test decoding
 			b.Run(tc.name, func(b *testing.B) {
 				b.ReportAllocs()
-				for i := 0; i < b.N; i++ {
+				for b.Loop() {
 					if err := rlp.DecodeBytes(data, tc.obj); err != nil {
 						b.Fatal(err)
 					}