diff --git a/nix/reth.nix b/nix/reth.nix index fabb3dff..6f5f1c5d 100644 --- a/nix/reth.nix +++ b/nix/reth.nix @@ -1,6 +1,5 @@ { lib, - pkgs, rustPlatform, }: @@ -13,7 +12,7 @@ let rev = "fe89979ad5e8fd233ae0aac0e7e56f465945ae70"; shallow = true; }; - pkgs2 = import pinnedPkgs {}; + pkgs = import pinnedPkgs {}; in @@ -33,8 +32,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgs.clang pkgs.libclang - pkgs2.rustc - pkgs2.cargo + pkgs.rustc + pkgs.cargo ]; env.LIBCLANG_PATH = pkgs.libclang.lib + "/lib/"; diff --git a/test/cmdtest_d/ethbump.py b/test/cmdtest_d/ethbump.py index 24051a57..b9c9b8c1 100755 --- a/test/cmdtest_d/ethbump.py +++ b/test/cmdtest_d/ethbump.py @@ -370,8 +370,8 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe def token_bal3(self): return self._token_bal_check(pat=rf'{dfl_sid}:E:4\s+6\.54321') - def wait_reth1(self): - return self._wait_for_block() if self.daemon.id == 'reth' else 'silent' + async def wait_reth1(self): + return await self._wait_for_block() if self.daemon.id == 'reth' else 'silent' def token_swaptxdo1(self): self.get_file_with_ext('sigtx', delete_all=True)