reth: minor testing fix; use clang from more recent nixpkgs in Nix build
This commit is contained in:
parent
09e70c4bf3
commit
c409b1b9a6
2 changed files with 5 additions and 6 deletions
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
@ -13,7 +12,7 @@ let
|
||||||
rev = "fe89979ad5e8fd233ae0aac0e7e56f465945ae70";
|
rev = "fe89979ad5e8fd233ae0aac0e7e56f465945ae70";
|
||||||
shallow = true;
|
shallow = true;
|
||||||
};
|
};
|
||||||
pkgs2 = import pinnedPkgs {};
|
pkgs = import pinnedPkgs {};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
@ -33,8 +32,8 @@ rustPlatform.buildRustPackage rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkgs.clang
|
pkgs.clang
|
||||||
pkgs.libclang
|
pkgs.libclang
|
||||||
pkgs2.rustc
|
pkgs.rustc
|
||||||
pkgs2.cargo
|
pkgs.cargo
|
||||||
];
|
];
|
||||||
|
|
||||||
env.LIBCLANG_PATH = pkgs.libclang.lib + "/lib/";
|
env.LIBCLANG_PATH = pkgs.libclang.lib + "/lib/";
|
||||||
|
|
|
||||||
|
|
@ -370,8 +370,8 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe
|
||||||
def token_bal3(self):
|
def token_bal3(self):
|
||||||
return self._token_bal_check(pat=rf'{dfl_sid}:E:4\s+6\.54321')
|
return self._token_bal_check(pat=rf'{dfl_sid}:E:4\s+6\.54321')
|
||||||
|
|
||||||
def wait_reth1(self):
|
async def wait_reth1(self):
|
||||||
return self._wait_for_block() if self.daemon.id == 'reth' else 'silent'
|
return await self._wait_for_block() if self.daemon.id == 'reth' else 'silent'
|
||||||
|
|
||||||
def token_swaptxdo1(self):
|
def token_swaptxdo1(self):
|
||||||
self.get_file_with_ext('sigtx', delete_all=True)
|
self.get_file_with_ext('sigtx', delete_all=True)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue