-
Notifications
You must be signed in to change notification settings - Fork 3.6k
/
mixed.rs
270 lines (247 loc) · 8.54 KB
/
mixed.rs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
// Copyright © Aptos Foundation
#[cfg(test)]
use crate::payload_client::user;
#[cfg(test)]
use crate::payload_client::validator::DummyValidatorTxnClient;
use crate::{
error::QuorumStoreError,
payload_client::{user::UserPayloadClient, PayloadClient},
};
use aptos_consensus_types::common::{Payload, PayloadFilter};
use aptos_logger::debug;
use aptos_types::{
dkg::{DKGTranscript, DKGTranscriptMetadata},
on_chain_config::ValidatorTxnConfig,
validator_txn::ValidatorTransaction,
};
use aptos_validator_transaction_pool as vtxn_pool;
use fail::fail_point;
use futures::future::BoxFuture;
use move_core_types::account_address::AccountAddress;
#[cfg(test)]
use std::collections::HashSet;
use std::{
cmp::min,
sync::Arc,
time::{Duration, Instant},
};
pub struct MixedPayloadClient {
validator_txn_config: ValidatorTxnConfig,
validator_txn_pool_client: Arc<dyn crate::payload_client::validator::ValidatorTxnPayloadClient>,
user_payload_client: Arc<dyn UserPayloadClient>,
}
impl MixedPayloadClient {
pub fn new(
validator_txn_config: ValidatorTxnConfig,
validator_txn_pool_client: Arc<
dyn crate::payload_client::validator::ValidatorTxnPayloadClient,
>,
user_payload_client: Arc<dyn UserPayloadClient>,
) -> Self {
Self {
validator_txn_config,
validator_txn_pool_client,
user_payload_client,
}
}
/// When enabled in smoke tests, generate 2 random validator transactions, 1 valid, 1 invalid.
fn extra_test_only_vtxns(&self) -> Vec<ValidatorTransaction> {
fail_point!("mixed_payload_client::extra_test_only_vtxns", |_| vec![
ValidatorTransaction::DKGResult(DKGTranscript {
metadata: DKGTranscriptMetadata {
epoch: 999,
author: AccountAddress::ZERO,
},
transcript_bytes: vec![],
}),
]);
vec![]
}
}
#[async_trait::async_trait]
impl PayloadClient for MixedPayloadClient {
async fn pull_payload(
&self,
mut max_poll_time: Duration,
mut max_items: u64,
mut max_bytes: u64,
validator_txn_filter: vtxn_pool::TransactionFilter,
user_txn_filter: PayloadFilter,
wait_callback: BoxFuture<'static, ()>,
pending_ordering: bool,
pending_uncommitted_blocks: usize,
recent_max_fill_fraction: f32,
) -> anyhow::Result<(Vec<ValidatorTransaction>, Payload), QuorumStoreError> {
// Pull validator txns first.
let validator_txn_pull_timer = Instant::now();
let mut validator_txns = self
.validator_txn_pool_client
.pull(
max_poll_time,
min(
max_items,
self.validator_txn_config.per_block_limit_txn_count(),
),
min(
max_bytes,
self.validator_txn_config.per_block_limit_total_bytes(),
),
validator_txn_filter,
)
.await;
validator_txns.extend(self.extra_test_only_vtxns());
debug!("num_validator_txns={}", validator_txns.len());
// Update constraints with validator txn pull results.
max_items -= validator_txns.len() as u64;
max_bytes -= validator_txns
.iter()
.map(|txn| txn.size_in_bytes())
.sum::<usize>() as u64;
max_poll_time = max_poll_time.saturating_sub(validator_txn_pull_timer.elapsed());
// Pull user payload.
let user_payload = self
.user_payload_client
.pull(
max_poll_time,
max_items,
max_bytes,
user_txn_filter,
wait_callback,
pending_ordering,
pending_uncommitted_blocks,
recent_max_fill_fraction,
)
.await?;
Ok((validator_txns, user_payload))
}
}
#[tokio::test]
async fn mixed_payload_client_should_prioritize_validator_txns() {
let all_validator_txns = vec![
ValidatorTransaction::dummy(b"1".to_vec()),
ValidatorTransaction::dummy(b"22".to_vec()),
ValidatorTransaction::dummy(b"333".to_vec()),
];
let all_user_txns = crate::test_utils::create_vec_signed_transactions(10);
let client = MixedPayloadClient {
validator_txn_config: ValidatorTxnConfig::V1 {
per_block_limit_txn_count: 99,
per_block_limit_total_bytes: 1048576,
},
validator_txn_pool_client: Arc::new(DummyValidatorTxnClient::new(
all_validator_txns.clone(),
)),
user_payload_client: Arc::new(user::DummyClient::new(all_user_txns.clone())),
};
let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
.pull_payload(
Duration::from_secs(1), // max_poll_time
99, // max_items
1048576, // size limit: 1MB
vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
PayloadFilter::Empty,
Box::pin(async {}),
false,
0,
0.,
)
.await
.unwrap()
else {
unreachable!()
};
assert_eq!(3, pulled_validator_txns.len());
assert_eq!(10, pulled_user_txns.len());
let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
.pull_payload(
Duration::from_micros(500), // max_poll_time
99, // max_items
1048576, // size limit: 1MB
vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
PayloadFilter::Empty,
Box::pin(async {}),
false,
0,
0.,
)
.await
.unwrap()
else {
unreachable!()
};
assert_eq!(1, pulled_validator_txns.len());
assert_eq!(0, pulled_user_txns.len());
let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
.pull_payload(
Duration::from_secs(1), // max_poll_time
1, // max_items
1048576, // size limit: 1MB
vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
PayloadFilter::Empty,
Box::pin(async {}),
false,
0,
0.,
)
.await
.unwrap()
else {
unreachable!()
};
assert_eq!(1, pulled_validator_txns.len());
assert_eq!(0, pulled_user_txns.len());
let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
.pull_payload(
Duration::from_secs(1), // max_poll_time
99, // max_items
all_validator_txns[0].size_in_bytes() as u64,
vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
PayloadFilter::Empty,
Box::pin(async {}),
false,
0,
0.,
)
.await
.unwrap()
else {
unreachable!()
};
assert_eq!(1, pulled_validator_txns.len());
assert_eq!(0, pulled_user_txns.len());
}
#[tokio::test]
async fn mixed_payload_client_should_respect_validator_txn_feature_flag() {
let all_validator_txns = vec![
ValidatorTransaction::dummy(b"1".to_vec()),
ValidatorTransaction::dummy(b"22".to_vec()),
ValidatorTransaction::dummy(b"333".to_vec()),
];
let all_user_txns = crate::test_utils::create_vec_signed_transactions(10);
let client = MixedPayloadClient {
validator_txn_config: ValidatorTxnConfig::default_disabled(),
validator_txn_pool_client: Arc::new(DummyValidatorTxnClient::new(
all_validator_txns.clone(),
)),
user_payload_client: Arc::new(user::DummyClient::new(all_user_txns.clone())),
};
let (pulled_validator_txns, Payload::DirectMempool(pulled_user_txns)) = client
.pull_payload(
Duration::from_millis(50), // max_poll_time
99, // max_items
1048576, // size limit: 1MB
vtxn_pool::TransactionFilter::PendingTxnHashSet(HashSet::new()),
PayloadFilter::Empty,
Box::pin(async {}),
false,
0,
0.,
)
.await
.unwrap()
else {
unreachable!()
};
assert_eq!(0, pulled_validator_txns.len());
assert_eq!(10, pulled_user_txns.len());
}