fix order of magnitude

Author: Tofel

seth/gas_adjuster.go

@@ -787,12 +787,16 @@ func calculateMagnitudeDifference(first, second *big.Float) (int, string) {
 	secondOrderOfMagnitude := math.Log10(secondFloat)
 
 	diff := firstOrderOfMagnitude - secondOrderOfMagnitude
+	absDiff := math.Abs(diff)
+
+	// Values within the same order of magnitude (less than 10x difference)
+	if absDiff < 1 {
+		return 0, "the same order of magnitude"
+	}
 
 	if diff < 0 {
 		intDiff := math.Floor(diff)
 		return int(intDiff), fmt.Sprintf("%d orders of magnitude smaller", int(math.Abs(intDiff)))
-	} else if diff > 0 && diff <= 1 {
-		return 0, "the same order of magnitude"
 	}
 
 	intDiff := int(math.Ceil(diff))

seth/gas_adjuster_test.go

@@ -32,10 +32,45 @@ func TestGasAdjuster_CalculateMagnitudeDifference(t *testing.T) {
 		{
 			name:         "Similar magnitude (within 1 order)",
 			first:        big.NewFloat(30_000_000_000), // 30 gwei
-			second:       big.NewFloat(2_000_000_000),  // 2 gwei
+			second:       big.NewFloat(31_000_000_000), // 31 gwei
 			expectedDiff: 0,
 			expectedText: "the same order of magnitude",
 		},
+		{
+			name:         "Similar magnitude (within 1 order)",
+			first:        big.NewFloat(100_000_000_000), // 100 gwei
+			second:       big.NewFloat(99_999_999_999),  // 99.999999999 gwei
+			expectedDiff: 0,
+			expectedText: "the same order of magnitude",
+		},
+		{
+			name:         "Similar magnitude (within 1 order)",
+			first:        big.NewFloat(30_000_000_000), // 30 gwei
+			second:       big.NewFloat(99_999_999_999), // 99.999999999 gwei
+			expectedDiff: 0,
+			expectedText: "the same order of magnitude",
+		},
+		{
+			name:         "Similar magnitude (within 1 order)",
+			first:        big.NewFloat(99_999_999_999), // 99.999999999 gwei
+			second:       big.NewFloat(30_000_000_000), // 30 gwei
+			expectedDiff: 0,
+			expectedText: "the same order of magnitude",
+		},
+		{
+			name:         "Similar magnitude (within 1 order)",
+			first:        big.NewFloat(99_999_999_999),  // 99.999999999 gwei
+			second:       big.NewFloat(100_000_000_000), // 100 gwei
+			expectedDiff: 0,
+			expectedText: "the same order of magnitude",
+		},
+		{
+			name:         "Just under 1 order of magnitude (same order)",
+			first:        big.NewFloat(9_999_999_999), // 9.999... gwei
+			second:       big.NewFloat(1_000_000_000), // 1 gwei
+			expectedDiff: 0,                           // Still same order (diff = 0.9999...)
+			expectedText: "the same order of magnitude",
+		},
 		{
 			name:         "Exactly 3 orders larger",
 			first:        big.NewFloat(1_000_000_000), // 1 gwei
@@ -71,11 +106,13 @@ func TestGasAdjuster_CalculateMagnitudeDifference(t *testing.T) {
 			diff, text := calculateMagnitudeDifference(tt.first, tt.second)
 
 			if diff != tt.expectedDiff {
-				t.Errorf("calculateMagnitudeDifference() diff = %v, want %v", diff, tt.expectedDiff)
+				t.Errorf("calculateMagnitudeDifference(first=%s wei, second=%s wei)\n  diff = %v, want %v",
+					tt.first.Text('f', 0), tt.second.Text('f', 0), diff, tt.expectedDiff)
 			}
 
 			if text != tt.expectedText {
-				t.Errorf("calculateMagnitudeDifference() text = %v, want %v", text, tt.expectedText)
+				t.Errorf("calculateMagnitudeDifference(first=%s wei, second=%s wei)\n  text = %q, want %q",
+					tt.first.Text('f', 0), tt.second.Text('f', 0), text, tt.expectedText)
 			}
 		})
 	}
@@ -226,13 +263,17 @@ func TestGasAdjuster_FeeEqualizerLogic(t *testing.T) {
 			resultTip := currentGasTip.Int64()
 
 			if resultBaseFee != tt.expectedBaseFee {
-				t.Errorf("Base fee after adjustment = %d, want %d\nDescription: %s",
-					resultBaseFee, tt.expectedBaseFee, tt.description)
+				t.Errorf("Base fee after adjustment = %d wei (%.4f gwei), want %d wei (%.4f gwei)\nDescription: %s",
+					resultBaseFee, float64(resultBaseFee)/1e9,
+					tt.expectedBaseFee, float64(tt.expectedBaseFee)/1e9,
+					tt.description)
 			}
 
 			if resultTip != tt.expectedTip {
-				t.Errorf("Tip after adjustment = %d, want %d\nDescription: %s",
-					resultTip, tt.expectedTip, tt.description)
+				t.Errorf("Tip after adjustment = %d wei (%.4f gwei), want %d wei (%.4f gwei)\nDescription: %s",
+					resultTip, float64(resultTip)/1e9,
+					tt.expectedTip, float64(tt.expectedTip)/1e9,
+					tt.description)
 			}
 
 			if baseFeeAdjusted != tt.shouldAdjustBaseFee {