Skip to content

Commit d0c5c48

Browse files
authored
Attempt to fix CI (#513)
* change urls
1 parent d45feb9 commit d0c5c48

File tree

6 files changed

+32
-29
lines changed

6 files changed

+32
-29
lines changed

.github/workflows/nextest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fail-fast: false
5050
matrix: ${{ fromJson(needs.matrices.outputs.test-matrix) }}
5151
env:
52-
ETH_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_API_KEY }}
52+
ETH_RPC_URL: https://eth-mainnet.g.alchemy.com/v2/${{ secrets.ALCHEMY_API_KEY }}
5353
CARGO_PROFILE_DEV_DEBUG: 0
5454
steps:
5555
- uses: actions/checkout@v4

Cargo.lock

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/cast/tests/cli/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,7 @@ casttest!(
17441744
#[ignore = "reth is currently slightly broken"]
17451745
tx_using_sender_and_nonce,
17461746
|_prj, cmd| {
1747-
let rpc = "https://reth-ethereum.ithaca.xyz/rpc";
1747+
let rpc = "https://ethereum.reth.rs/rpc";
17481748
// <https://etherscan.io/tx/0x5bcd22734cca2385dc25b2d38a3d33a640c5961bd46d390dff184c894204b594>
17491749
let args = vec![
17501750
"tx",

crates/forge/tests/cli/test_cmd.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3530,9 +3530,12 @@ contract InterceptInitcodeTest is DSTest {
35303530
// <https://github.com/foundry-rs/foundry/issues/10552>
35313531
forgetest_init!(should_preserve_fork_state_setup, |prj, cmd| {
35323532
prj.wipe_contracts();
3533+
3534+
let endpoint = rpc::next_http_archive_rpc_url();
3535+
35333536
prj.add_test(
35343537
"Counter.t.sol",
3535-
r#"
3538+
&r#"
35363539
import "forge-std/Test.sol";
35373540
import {StdChains} from "forge-std/StdChains.sol";
35383541
@@ -3559,7 +3562,7 @@ contract CounterTest is Test {
35593562
// Temporary workaround for `https://eth.llamarpc.com/` being down
35603563
setChain("mainnet", ChainData({
35613564
name: "mainnet",
3562-
rpcUrl: "https://reth-ethereum.ithaca.xyz/rpc",
3565+
rpcUrl: "<url>",
35633566
chainId: 1
35643567
}));
35653568
@@ -3594,7 +3597,8 @@ contract CounterTest is Test {
35943597
assertEq(data[3].bridges.length, 2);
35953598
}
35963599
}
3597-
"#,
3600+
"#
3601+
.replace("<url>", &endpoint),
35983602
)
35993603
.unwrap();
36003604

crates/test-utils/src/rpc.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ fn shuffled<T>(mut vec: Vec<T>) -> Vec<T> {
1919
static RETH_ARCHIVE_HOSTS: LazyLock<Vec<&'static str>> = LazyLock::new(|| {
2020
shuffled(vec![
2121
//
22-
"reth-ethereum.ithaca.xyz",
22+
"ethereum.reth.rs",
2323
])
2424
});
2525

2626
// List of public reth nodes to use (archive and non archive)
2727
static RETH_HOSTS: LazyLock<Vec<&'static str>> = LazyLock::new(|| {
2828
shuffled(vec![
2929
//
30-
"reth-ethereum.ithaca.xyz",
31-
"reth-ethereum-full.ithaca.xyz",
30+
"ethereum.reth.rs",
3231
])
3332
});
3433

testdata/default/cheats/RpcUrls.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ contract RpcUrlTest is DSTest {
1010
// returns the correct url
1111
function testCanGetRpcUrl() public {
1212
string memory url = vm.rpcUrl("mainnet");
13-
assertTrue(bytes(url).length >= 36);
13+
assertTrue(bytes(url).length != 0);
1414
}
1515

1616
// returns an error if env alias does not exist

0 commit comments

Comments
 (0)