remove AdjustTime hacks

core/chains/evm/logpoller/log_poller_test.go

@@ -1029,7 +1029,7 @@ func TestLogPoller_PollAndSaveLogs(t *testing.T) {
 
 			b, err = th.Client.BlockByNumber(testutils.Context(t), nil)
 			require.NoError(t, err)
-			require.Equal(t, blockTimestamp+uint64(time.Hour)+1, b.Time())
+			require.Equal(t, blockTimestamp+uint64(time.Hour/time.Second)+1, b.Time())
 		})
 	}
 }

core/services/vrf/v2/integration_v2_plus_test.go

@@ -118,11 +118,7 @@ func newVRFCoordinatorV2PlusUniverse(t *testing.T, key ethkey.KeyV2, numConsumer
 	require.NoError(t, err)
 	blockTime := time.Unix(int64(h.Time), 0)
 	// Move the clock closer to the current time. We set first block to be 24 hours ago.
-	adjust := time.Since(blockTime) - 24*time.Hour
-	// hack to convert nanos durations to seconds until geth patches incorrect conversion
-	// remove after fix is merged: https://github.com/ethereum/go-ethereum/pull/30138
-	adjust = adjust / 1e9
-	err = backend.AdjustTime(adjust)
+	err = backend.AdjustTime(time.Since(blockTime) - 24*time.Hour)
 	require.NoError(t, err)
 	backend.Commit()
 

core/services/vrf/v2/integration_v2_test.go

@@ -190,11 +190,7 @@ func newVRFCoordinatorV2Universe(t *testing.T, key ethkey.KeyV2, numConsumers in
 	require.NoError(t, err)
 	blockTime := time.Unix(int64(h.Time), 0)
 	// Move the clock closer to the current time. We set first block to be 24 hours ago.
-	adjust := time.Since(blockTime) - 24*time.Hour
-	// hack to convert nanos durations to seconds until geth patches incorrect conversion
-	// remove after fix is merged: https://github.com/ethereum/go-ethereum/pull/30138
-	adjust = adjust / 1e9
-	err = backend.AdjustTime(adjust)
+	err = backend.AdjustTime(time.Since(blockTime) - 24*time.Hour)
 	require.NoError(t, err)
 	backend.Commit()
 

core/services/vrf/v2/listener_v2_log_listener_test.go

@@ -87,11 +87,7 @@ func setupVRFLogPollerListenerTH(t *testing.T) *vrfLogPollerListenerTH {
 	blockTime := time.Unix(int64(h.Time), 0)
 	// VRF Listener relies on block timestamps, but SimulatedBackend uses by default clock starting from 1970-01-01
 	// This trick is used to move the clock closer to the current time. We set first block to be 24 hours ago.
-	adjust := time.Since(blockTime) - 24*time.Hour
-	// hack to convert nanos durations to seconds until geth patches incorrect conversion
-	// remove after fix is merged: https://github.com/ethereum/go-ethereum/pull/30138
-	adjust = adjust / 1e9
-	err = backend.AdjustTime(adjust)
+	err = backend.AdjustTime(time.Since(blockTime) - 24*time.Hour)
 	require.NoError(t, err)
 	backend.Commit()