@@ -209,19 +209,20 @@ async fn request_rav<
209209 time_stamp_buffer : u64 , // Buffer for timestamping, see tap_core for details
210210 aggregator_client : & ( HttpClient , String ) , // HttpClient for making requests to the tap_aggregator server
211211) -> Result < ( ) > {
212- let rav;
213212 // Create the aggregate_receipts request params
214- {
215- let mut manager_guard = manager. lock ( ) . await ;
216- rav = manager_guard. create_rav_request ( time_stamp_buffer) ?;
217- }
218- match rav. invalid_receipts . is_empty ( ) {
213+ let rav_request = manager. lock ( ) . await . create_rav_request ( time_stamp_buffer) ?;
214+
215+ match rav_request. invalid_receipts . is_empty ( ) {
219216 true => Ok ( ( ) ) ,
220217 false => Err ( Error :: msg ( "Invalid receipts found" ) ) ,
221218 } ?;
222219
223220 // To-do: Need to add previous RAV, when tap_manager supports replacing receipts
224- let params = rpc_params ! ( & aggregator_client. 1 , & rav. valid_receipts, None :: <( ) >) ;
221+ let params = rpc_params ! (
222+ & aggregator_client. 1 ,
223+ & rav_request. valid_receipts,
224+ rav_request. previous_rav
225+ ) ;
225226
226227 // Call the aggregate_receipts method on the other server
227228 let remote_rav_result: jsonrpsee_helpers:: JsonRpcResponse < SignedRAV > = aggregator_client
@@ -231,7 +232,7 @@ async fn request_rav<
231232 {
232233 let mut manager_guard = manager. lock ( ) . await ;
233234 let _result =
234- manager_guard. verify_and_store_rav ( rav . expected_rav , remote_rav_result. data ) ?;
235+ manager_guard. verify_and_store_rav ( rav_request . expected_rav , remote_rav_result. data ) ?;
235236 }
236237 Ok ( ( ) )
237238}
0 commit comments