Skip to content

Commit

Permalink
Resolve rebase issues
Browse files Browse the repository at this point in the history
  • Loading branch information
masqrauder committed Jul 15, 2023
1 parent d7af6b9 commit b43a48f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions node/src/blockchain/blockchain_interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,7 @@ mod tests {
let subject =
BlockchainInterfaceWeb3::new(transport, event_loop_handle, TEST_DEFAULT_CHAIN);

let end_block_nbr = 1024u64;
let result = subject
.retrieve_transactions(
BlockNumber::Number(42u64.into()),
Expand Down Expand Up @@ -1073,6 +1074,7 @@ mod tests {
let subject =
BlockchainInterfaceWeb3::new(transport, event_loop_handle, TEST_DEFAULT_CHAIN);

let end_block_nbr = 1024u64;
let result = subject
.retrieve_transactions(
BlockNumber::Number(42u64.into()),
Expand Down Expand Up @@ -1210,6 +1212,7 @@ mod tests {
)
.unwrap();

let end_block_nbr = 1024u64;
let subject =
BlockchainInterfaceWeb3::new(transport, event_loop_handle, TEST_DEFAULT_CHAIN);

Expand Down Expand Up @@ -1246,11 +1249,8 @@ mod tests {
)
.unwrap();

let subject = BlockchainInterfaceNonClandestine::new(
transport,
event_loop_handle,
TEST_DEFAULT_CHAIN,
);
let subject =
BlockchainInterfaceWeb3::new(transport, event_loop_handle, TEST_DEFAULT_CHAIN);

let start_block = BlockNumber::Number(42u64.into());
let result = subject.retrieve_transactions(
Expand Down Expand Up @@ -2661,7 +2661,7 @@ mod tests {
let transport = TestTransport::default()
.prepare_params(&prepare_params_arc)
.send_result(json!("0x1e37066"));
let subject = BlockchainInterfaceNonClandestine::new(
let subject = BlockchainInterfaceWeb3::new(
transport,
make_fake_event_loop_handle(),
TEST_DEFAULT_CHAIN,
Expand All @@ -2685,7 +2685,7 @@ mod tests {
let transport = TestTransport::default()
.prepare_params(&prepare_params_arc)
.send_result(Value::Null);
let subject = BlockchainInterfaceNonClandestine::new(
let subject = BlockchainInterfaceWeb3::new(
transport,
make_fake_event_loop_handle(),
TEST_DEFAULT_CHAIN,
Expand Down Expand Up @@ -2713,7 +2713,7 @@ mod tests {
.prepare_params(&prepare_params_arc)
.send_result(Value::String("this is an invalid block number".to_string()));

let subject = BlockchainInterfaceNonClandestine::new(
let subject = BlockchainInterfaceWeb3::new(
transport.clone(),
make_fake_event_loop_handle(),
TEST_DEFAULT_CHAIN,
Expand Down

0 comments on commit b43a48f

Please sign in to comment.