Skip to content

Commit 762dbe4

Browse files
utkarshg6kauri-hero
utkarshg6
and
kauri-hero
authored
GH-688: HOTFIX: Remove version incompatibility issue that's occurring on v0.7.2 (#259)
* GH-688: rename the field originator_alias_public_key to originator_public_key * GH-688: renames in multinode test * GH-688: increase the hard limit for bookkeeping test from 3.5s to 7s --------- Co-authored-by: KauriHero <[email protected]>
1 parent c53a368 commit 762dbe4

File tree

11 files changed

+50
-50
lines changed

11 files changed

+50
-50
lines changed

‎multinode_integration_tests/tests/bookkeeping_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn provided_and_consumed_services_are_recorded_in_databases() {
4141
let payables = non_pending_payables(&originating_node);
4242

4343
// Waiting until the serving nodes have finished accruing their receivables
44-
thread::sleep(Duration::from_millis(3500));
44+
thread::sleep(Duration::from_secs(7));
4545

4646
// get all receivables from all other nodes
4747
let receivable_balances = non_originating_nodes

‎multinode_integration_tests/tests/connection_termination_test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ fn create_request_icp(
338338
target_hostname: Some(format!("{}", server.local_addr().ip())),
339339
target_port: server.local_addr().port(),
340340
protocol: ProxyProtocol::HTTP,
341-
originator_alias_public_key: originating_node.main_public_key().clone(),
341+
originator_public_key: originating_node.main_public_key().clone(),
342342
},
343343
)),
344344
exit_node.main_public_key(),
@@ -383,7 +383,7 @@ fn create_meaningless_icp(
383383
target_hostname: Some(format!("nowhere.com")),
384384
target_port: socket_addr.port(),
385385
protocol: ProxyProtocol::HTTP,
386-
originator_alias_public_key: originating_node.main_public_key().clone(),
386+
originator_public_key: originating_node.main_public_key().clone(),
387387
},
388388
)),
389389
exit_node.main_public_key(),
@@ -473,7 +473,7 @@ fn create_client_drop_report(
473473
target_hostname: Some(String::from("doesnt.matter.com")),
474474
target_port: 80,
475475
protocol: ProxyProtocol::HTTP,
476-
originator_alias_public_key: originating_node.main_public_key().clone(),
476+
originator_public_key: originating_node.main_public_key().clone(),
477477
},
478478
));
479479

‎node/src/hopper/routing_service.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ mod tests {
19111911
target_hostname: Some("hostname".to_string()),
19121912
target_port: 1234,
19131913
protocol: ProxyProtocol::TLS,
1914-
originator_alias_public_key: PublicKey::new(b"1234"),
1914+
originator_public_key: PublicKey::new(b"1234"),
19151915
},
19161916
)),
19171917
)

‎node/src/proxy_client/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl Handler<ExpiredCoresPackage<ClientRequestPayload_0v1>> for ProxyClient {
113113
let return_route = msg.remaining_route;
114114
let latest_stream_context = StreamContext {
115115
return_route,
116-
payload_destination_key: payload.originator_alias_public_key.clone(),
116+
payload_destination_key: payload.originator_public_key.clone(),
117117
paying_wallet: paying_wallet.clone(),
118118
};
119119
debug!(
@@ -610,7 +610,7 @@ mod tests {
610610
target_hostname: Some(String::from("target.hostname.com")),
611611
target_port: 1234,
612612
protocol: ProxyProtocol::HTTP,
613-
originator_alias_public_key: PublicKey::new(&b"originator_public_key"[..]),
613+
originator_public_key: PublicKey::new(&b"originator_public_key"[..]),
614614
};
615615
let cryptde = main_cryptde();
616616
let package = ExpiredCoresPackage::new(
@@ -753,7 +753,7 @@ mod tests {
753753
target_hostname: None,
754754
target_port: 0,
755755
protocol: ProxyProtocol::HTTP,
756-
originator_alias_public_key: PublicKey::new(&b"originator"[..]),
756+
originator_public_key: PublicKey::new(&b"originator"[..]),
757757
};
758758
let key1 = make_meaningless_public_key();
759759
let key2 = make_meaningless_public_key();
@@ -813,7 +813,7 @@ mod tests {
813813
target_hostname: None,
814814
target_port: 0,
815815
protocol: ProxyProtocol::HTTP,
816-
originator_alias_public_key: PublicKey::new(&b"originator"[..]),
816+
originator_public_key: PublicKey::new(&b"originator"[..]),
817817
};
818818
let package = ExpiredCoresPackage::new(
819819
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -870,7 +870,7 @@ mod tests {
870870
target_hostname: None,
871871
target_port: 0,
872872
protocol: ProxyProtocol::HTTP,
873-
originator_alias_public_key: alias_cryptde.public_key().clone(),
873+
originator_public_key: alias_cryptde.public_key().clone(),
874874
};
875875
let zero_hop_remaining_route = Route::one_way(
876876
RouteSegment::new(
@@ -1223,7 +1223,7 @@ mod tests {
12231223
target_hostname: None,
12241224
target_port: 0,
12251225
protocol: ProxyProtocol::HTTP,
1226-
originator_alias_public_key: originator_public_key.clone(),
1226+
originator_public_key: originator_public_key.clone(),
12271227
};
12281228
let before = SystemTime::now();
12291229

‎node/src/proxy_client/stream_establisher.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ mod tests {
189189
target_hostname: Some("blah".to_string()),
190190
target_port: 0,
191191
protocol: ProxyProtocol::HTTP,
192-
originator_alias_public_key: subject.cryptde.public_key().clone(),
192+
originator_public_key: subject.cryptde.public_key().clone(),
193193
},
194194
read_stream,
195195
SocketAddr::from_str("1.2.3.4:5678").unwrap(),

‎node/src/proxy_client/stream_handler_pool.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ mod tests {
602602
target_hostname: Some("www.example.com".to_string()),
603603
target_port: HTTP_PORT,
604604
protocol: ProxyProtocol::HTTP,
605-
originator_alias_public_key: cryptde.public_key().clone(),
605+
originator_public_key: cryptde.public_key().clone(),
606606
};
607607

608608
StreamHandlerPoolReal::process_package(payload, None, Arc::new(Mutex::new(inner)));
@@ -635,7 +635,7 @@ mod tests {
635635
target_hostname: None,
636636
target_port: HTTP_PORT,
637637
protocol: ProxyProtocol::HTTP,
638-
originator_alias_public_key: PublicKey::new(&b"men's souls"[..]),
638+
originator_public_key: PublicKey::new(&b"men's souls"[..]),
639639
};
640640
let write_parameters = Arc::new(Mutex::new(vec![]));
641641
let tx_to_write = Box::new(
@@ -697,7 +697,7 @@ mod tests {
697697
target_hostname: Some(String::from("that.try")),
698698
target_port: HTTP_PORT,
699699
protocol: ProxyProtocol::HTTP,
700-
originator_alias_public_key: originator_key,
700+
originator_public_key: originator_key,
701701
};
702702
let package = ExpiredCoresPackage::new(
703703
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -766,7 +766,7 @@ mod tests {
766766
target_hostname: Some(String::from("3.4.5.6:80")),
767767
target_port: HTTP_PORT,
768768
protocol: ProxyProtocol::HTTP,
769-
originator_alias_public_key: PublicKey::new(&b"men's souls"[..]),
769+
originator_public_key: PublicKey::new(&b"men's souls"[..]),
770770
};
771771
let package = ExpiredCoresPackage::new(
772772
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -875,7 +875,7 @@ mod tests {
875875
target_hostname: Some(String::from("3.4.5.6")),
876876
target_port: HTTP_PORT,
877877
protocol: ProxyProtocol::HTTP,
878-
originator_alias_public_key: PublicKey::new(&b"men's souls"[..]),
878+
originator_public_key: PublicKey::new(&b"men's souls"[..]),
879879
};
880880
let package = ExpiredCoresPackage::new(
881881
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -982,7 +982,7 @@ mod tests {
982982
target_hostname: None,
983983
target_port: HTTP_PORT,
984984
protocol: ProxyProtocol::HTTP,
985-
originator_alias_public_key: originator_key,
985+
originator_public_key: originator_key,
986986
};
987987
let package = ExpiredCoresPackage::new(
988988
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -1051,7 +1051,7 @@ mod tests {
10511051
target_hostname: Some(String::from("that.try")),
10521052
target_port: HTTP_PORT,
10531053
protocol: ProxyProtocol::HTTP,
1054-
originator_alias_public_key: PublicKey::new(&b"men's souls"[..]),
1054+
originator_public_key: PublicKey::new(&b"men's souls"[..]),
10551055
};
10561056
let package = ExpiredCoresPackage::new(
10571057
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -1164,7 +1164,7 @@ mod tests {
11641164
target_hostname: Some(String::from("that.try")),
11651165
target_port: HTTP_PORT,
11661166
protocol: ProxyProtocol::HTTP,
1167-
originator_alias_public_key: originator_key,
1167+
originator_public_key: originator_key,
11681168
};
11691169
let package = ExpiredCoresPackage::new(
11701170
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -1254,7 +1254,7 @@ mod tests {
12541254
target_hostname: Some(String::from("that.try")),
12551255
target_port: HTTP_PORT,
12561256
protocol: ProxyProtocol::HTTP,
1257-
originator_alias_public_key: PublicKey::new(&b"men's souls"[..]),
1257+
originator_public_key: PublicKey::new(&b"men's souls"[..]),
12581258
};
12591259

12601260
let package = ExpiredCoresPackage::new(
@@ -1367,7 +1367,7 @@ mod tests {
13671367
target_hostname: Some(String::from("that.try")),
13681368
target_port: HTTP_PORT,
13691369
protocol: ProxyProtocol::HTTP,
1370-
originator_alias_public_key: originator_key,
1370+
originator_public_key: originator_key,
13711371
};
13721372
let package = ExpiredCoresPackage::new(
13731373
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -1429,7 +1429,7 @@ mod tests {
14291429
target_hostname: Some(String::from("that.try")),
14301430
target_port: HTTP_PORT,
14311431
protocol: ProxyProtocol::HTTP,
1432-
originator_alias_public_key: PublicKey::new(&b"men's souls"[..]),
1432+
originator_public_key: PublicKey::new(&b"men's souls"[..]),
14331433
};
14341434
let package = ExpiredCoresPackage::new(
14351435
SocketAddr::from_str("1.2.3.4:1234").unwrap(),
@@ -1497,7 +1497,7 @@ mod tests {
14971497
target_hostname: None,
14981498
target_port: HTTP_PORT,
14991499
protocol: ProxyProtocol::HTTP,
1500-
originator_alias_public_key: PublicKey::new(&b"booga"[..]),
1500+
originator_public_key: PublicKey::new(&b"booga"[..]),
15011501
};
15021502
let package = ExpiredCoresPackage::new(
15031503
SocketAddr::from_str("1.2.3.4:1234").unwrap(),

‎node/src/proxy_server/client_request_payload_factory.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl ClientRequestPayloadFactory for ClientRequestPayloadFactoryReal {
6060
target_hostname,
6161
target_port,
6262
protocol: protocol_pack.proxy_protocol(),
63-
originator_alias_public_key: cryptde.public_key().clone(),
63+
originator_public_key: cryptde.public_key().clone(),
6464
})
6565
}
6666
}
@@ -113,7 +113,7 @@ mod tests {
113113
target_hostname: Some(String::from("borkoed.com")),
114114
target_port: 2345,
115115
protocol: ProxyProtocol::HTTP,
116-
originator_alias_public_key: cryptde.public_key().clone(),
116+
originator_public_key: cryptde.public_key().clone(),
117117
})
118118
);
119119
}
@@ -148,7 +148,7 @@ mod tests {
148148
target_hostname: Some(String::from("borkoed.com")),
149149
target_port: HTTP_PORT,
150150
protocol: ProxyProtocol::HTTP,
151-
originator_alias_public_key: cryptde.public_key().clone(),
151+
originator_public_key: cryptde.public_key().clone(),
152152
})
153153
);
154154
}
@@ -202,7 +202,7 @@ mod tests {
202202
target_hostname: Some(String::from("server.com")),
203203
target_port: 443,
204204
protocol: ProxyProtocol::TLS,
205-
originator_alias_public_key: cryptde.public_key().clone(),
205+
originator_public_key: cryptde.public_key().clone(),
206206
})
207207
);
208208
}
@@ -250,7 +250,7 @@ mod tests {
250250
target_hostname: None,
251251
target_port: 443,
252252
protocol: ProxyProtocol::TLS,
253-
originator_alias_public_key: cryptde.public_key().clone(),
253+
originator_public_key: cryptde.public_key().clone(),
254254
})
255255
);
256256
}

0 commit comments

Comments
 (0)