Browse Source

reth: minor testing fix; use clang from more recent nixpkgs in Nix build

The MMGen Project 2 months ago
parent
commit
c409b1b9a6
2 changed files with 5 additions and 6 deletions
  1. 3 4
      nix/reth.nix
  2. 2 2
      test/cmdtest_d/ethbump.py

+ 3 - 4
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/";

+ 2 - 2
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)