eth/catalyst: use setcanonical instead of sethead in simulated fork

eth/catalyst/simulated_beacon.go

@@ -306,7 +306,8 @@ func (c *SimulatedBeacon) Fork(parentHash common.Hash) error {
 	if parent == nil {
 		return errors.New("parent not found")
 	}
-	return c.eth.BlockChain().SetHead(parent.NumberU64())
+	_, err := c.eth.BlockChain().SetCanonical(parent)
+	return err
 }
 
 // AdjustTime creates a new block with an adjusted timestamp.

ethclient/simulated/backend_test.go

@@ -194,8 +194,8 @@ func TestFork(t *testing.T) {
 //  2. Send a transaction.
 //  3. Check that the TX is included in block 1.
 //  4. Fork by using the parent block as ancestor.
-//  5. Mine a block, Re-send the transaction and mine another one.
-//  6. Check that the TX is now included in block 2.
+//  5. Mine a block. We expect the out-forked tx to have trickled to the pool, and into the new block.
+//  6. Check that the TX is now included in (the new) block 1.
 func TestForkResendTx(t *testing.T) {
 	t.Parallel()
 	testAddr := crypto.PubkeyToAddress(testKey.PublicKey)
@@ -231,12 +231,8 @@ func TestForkResendTx(t *testing.T) {
 
 	// 5.
 	sim.Commit()
-	if err := client.SendTransaction(ctx, tx); err != nil {
-		t.Fatalf("sending transaction: %v", err)
-	}
-	sim.Commit()
 	receipt, _ = client.TransactionReceipt(ctx, tx.Hash())
-	if h := receipt.BlockNumber.Uint64(); h != 2 {
+	if h := receipt.BlockNumber.Uint64(); h != 1 {
 		t.Errorf("TX included in wrong block: %d", h)
 	}
 }