@@ -6,7 +6,9 @@ use crate::{
66 Hasher , Network as NetworkT , NetworkData as NetworkDataT , NodeCount , NodeIndex , NodeMap ,
77 Recipient , Round , SessionId , Signed , SpawnHandle , TaskHandle ,
88} ;
9- use aleph_bft_mock:: { Data , Hash64 , Hasher64 , Keychain , NetworkHook , Router , Spawner } ;
9+ use aleph_bft_mock:: {
10+ Data , DataProvider , Hash64 , Hasher64 , Keychain , NetworkHook , Router , Spawner ,
11+ } ;
1012use futures:: { channel:: oneshot, StreamExt } ;
1113use log:: { debug, error, trace} ;
1214use parking_lot:: Mutex ;
@@ -230,7 +232,12 @@ impl AlertHook {
230232}
231233
232234impl NetworkHook < NetworkData > for AlertHook {
233- fn update_state ( & mut self , data : & mut NetworkData , sender : NodeIndex , recipient : NodeIndex ) {
235+ fn process_message (
236+ & mut self ,
237+ data : NetworkData ,
238+ sender : NodeIndex ,
239+ recipient : NodeIndex ,
240+ ) -> Vec < ( NetworkData , NodeIndex , NodeIndex ) > {
234241 use crate :: { alerts:: AlertMessage :: * , network:: NetworkDataInner :: * } ;
235242 if let crate :: NetworkData ( Alert ( ForkAlert ( _) ) ) = data {
236243 * self
@@ -239,21 +246,21 @@ impl NetworkHook<NetworkData> for AlertHook {
239246 . entry ( ( sender, recipient) )
240247 . or_insert ( 0 ) += 1 ;
241248 }
249+ vec ! [ ( data, sender, recipient) ]
242250 }
243251}
244252
245253async fn honest_members_agree_on_batches_byzantine (
246254 n_members : NodeCount ,
247255 n_honest : NodeCount ,
248256 n_batches : usize ,
249- network_reliability : f64 ,
250257) {
251258 init_log ( ) ;
252259 let spawner = Spawner :: new ( ) ;
253260 let mut batch_rxs = Vec :: new ( ) ;
254261 let mut exits = Vec :: new ( ) ;
255262 let mut handles = Vec :: new ( ) ;
256- let ( mut net_hub, networks) = Router :: new ( n_members, network_reliability ) ;
263+ let ( mut net_hub, networks) = Router :: new ( n_members) ;
257264
258265 let alert_hook = AlertHook :: new ( ) ;
259266 net_hub. add_hook ( alert_hook. clone ( ) ) ;
@@ -270,7 +277,7 @@ async fn honest_members_agree_on_batches_byzantine(
270277 exit_tx,
271278 handle,
272279 ..
273- } = spawn_honest_member ( spawner, ix, n_members, vec ! [ ] , network) ;
280+ } = spawn_honest_member ( spawner, ix, n_members, vec ! [ ] , DataProvider :: new ( ) , network) ;
274281 batch_rxs. push ( finalization_rx) ;
275282 ( exit_tx, handle)
276283 } ;
@@ -317,17 +324,17 @@ async fn honest_members_agree_on_batches_byzantine(
317324#[ tokio:: test( flavor = "multi_thread" ) ]
318325#[ serial]
319326async fn small_byzantine_one_forker ( ) {
320- honest_members_agree_on_batches_byzantine ( 4 . into ( ) , 3 . into ( ) , 5 , 1.0 ) . await ;
327+ honest_members_agree_on_batches_byzantine ( 4 . into ( ) , 3 . into ( ) , 5 ) . await ;
321328}
322329
323330#[ tokio:: test( flavor = "multi_thread" ) ]
324331#[ serial]
325332async fn small_byzantine_two_forkers ( ) {
326- honest_members_agree_on_batches_byzantine ( 7 . into ( ) , 5 . into ( ) , 5 , 1.0 ) . await ;
333+ honest_members_agree_on_batches_byzantine ( 7 . into ( ) , 5 . into ( ) , 5 ) . await ;
327334}
328335
329336#[ tokio:: test( flavor = "multi_thread" ) ]
330337#[ serial]
331338async fn medium_byzantine_ten_forkers ( ) {
332- honest_members_agree_on_batches_byzantine ( 31 . into ( ) , 21 . into ( ) , 5 , 1.0 ) . await ;
339+ honest_members_agree_on_batches_byzantine ( 31 . into ( ) , 21 . into ( ) , 5 ) . await ;
333340}
0 commit comments