Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make valid packets for netid c00053 free #742

Merged
merged 3 commits into from
Feb 23, 2024
Merged

make valid packets for netid c00053 free #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6837d4
make valid packets for netid c00053 free
jeffgrunewald Feb 22, 2024
bc62240
base packet verifier charge on free field from hpr packet report
jeffgrunewald Feb 22, 2024
7132d5e
dont save 0 dc packet reports in iot verifier
jeffgrunewald Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions file_store/src/iot_packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub struct PacketRouterPacketReport {
pub oui: u64,
pub net_id: u32,
pub rssi: i32,
pub free: bool,
/// Frequency in Hz
pub frequency: u32,
pub snr: f32,
Expand Down Expand Up @@ -90,6 +91,7 @@ impl TryFrom<PacketRouterPacketReportV1> for PacketRouterPacketReport {
oui: v.oui,
net_id: v.net_id,
rssi: v.rssi,
free: v.free,
frequency: v.frequency,
snr: v.snr,
data_rate,
Expand Down
6 changes: 5 additions & 1 deletion iot_packet_verifier/src/verifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ where
continue;
}

let debit_amount = payload_size_to_dc(report.payload_size as u64);
let debit_amount = if report.free {
0
} else {
payload_size_to_dc(report.payload_size as u64)
};

let payer = self
.config_server
Expand Down
142 changes: 113 additions & 29 deletions iot_packet_verifier/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ fn packet_report(
timestamp: u64,
payload_size: u32,
payload_hash: Vec<u8>,
free: bool,
) -> PacketRouterPacketReport {
PacketRouterPacketReport {
received_timestamp: Utc.timestamp_opt(timestamp as i64, 0).unwrap(),
oui,
net_id: 0,
rssi: 0,
free,
frequency: 0,
snr: 0.0,
data_rate: DataRate::Fsk50,
Expand All @@ -121,6 +123,7 @@ fn join_packet_report(
oui,
net_id: 0,
rssi: 0,
free: true,
frequency: 0,
snr: 0.0,
data_rate: DataRate::Fsk50,
Expand All @@ -132,12 +135,21 @@ fn join_packet_report(
}
}

fn valid_packet(timestamp: u64, payload_size: u32, payload_hash: Vec<u8>) -> ValidPacket {
fn valid_packet(
timestamp: u64,
payload_size: u32,
payload_hash: Vec<u8>,
paid: bool,
) -> ValidPacket {
ValidPacket {
payload_size,
payload_hash,
gateway: vec![],
num_dcs: payload_size_to_dc(payload_size as u64) as u32,
num_dcs: if paid {
payload_size_to_dc(payload_size as u64) as u32
} else {
0
},
packet_timestamp: timestamp,
}
}
Expand Down Expand Up @@ -194,9 +206,9 @@ async fn test_config_unlocking() {
1,
balances.clone(),
stream::iter(vec![
packet_report(0, 0, 24, vec![1]),
packet_report(0, 1, 48, vec![2]),
packet_report(0, 2, 1, vec![3]),
packet_report(0, 0, 24, vec![1], false),
packet_report(0, 1, 48, vec![2], false),
packet_report(0, 2, 1, vec![3], false),
]),
&mut valid_packets,
&mut invalid_packets,
Expand Down Expand Up @@ -252,9 +264,9 @@ async fn test_config_unlocking() {
1,
balances.clone(),
stream::iter(vec![
packet_report(0, 0, 24, vec![1]),
packet_report(0, 1, 48, vec![2]),
packet_report(0, 2, 1, vec![3]),
packet_report(0, 0, 24, vec![1], false),
packet_report(0, 1, 48, vec![2], false),
packet_report(0, 2, 1, vec![3], false),
]),
&mut valid_packets,
&mut invalid_packets,
Expand All @@ -274,21 +286,87 @@ async fn test_config_unlocking() {
);
}

#[tokio::test]
async fn test_verifier_free_packets() {
// Org packets
let packets = vec![
packet_report(0, 0, 24, vec![4], true),
packet_report(0, 1, 48, vec![5], true),
packet_report(0, 2, 1, vec![6], true),
];

let org_pubkey = PublicKeyBinary::from(vec![0]);

// Set up orgs:
let orgs = MockConfigServer::default();
orgs.insert(0_u64, org_pubkey.clone()).await;

// Set up balances:
let mut balances = HashMap::new();
balances.insert(org_pubkey.clone(), 5);
let balances = InstantlyBurnedBalance(Arc::new(Mutex::new(balances)));

// Set up output:
let mut valid_packets = Vec::new();
let mut invalid_packets = Vec::new();

// Set up verifier:
let mut verifier = Verifier {
debiter: balances.0.clone(),
config_server: orgs,
};
// Run the verifier:
verifier
.verify(
1,
balances.clone(),
stream::iter(packets),
&mut valid_packets,
&mut invalid_packets,
)
.await
.unwrap();

// Verify packet reports:
assert_eq!(
valid_packets,
vec![
valid_packet(0, 24, vec![4], false),
valid_packet(1000, 48, vec![5], false),
valid_packet(2000, 1, vec![6], false),
]
);

assert!(invalid_packets.is_empty());

let payers = verifier.config_server.payers.lock().await;
assert!(payers.get(&0).unwrap().enabled);

assert_eq!(
verifier
.debiter
.payer_balance(&org_pubkey)
.await
.expect("unchanged balance"),
5
);
}

#[tokio::test]
async fn test_verifier() {
let packets = vec![
// Packets for first OUI
packet_report(0, 0, 24, vec![1]),
packet_report(0, 1, 48, vec![2]),
packet_report(0, 2, 1, vec![3]),
packet_report(0, 0, 24, vec![1], false),
packet_report(0, 1, 48, vec![2], false),
packet_report(0, 2, 1, vec![3], false),
join_packet_report(0, 3, 1, vec![4]),
// Packets for second OUI
packet_report(1, 0, 24, vec![4]),
packet_report(1, 1, 48, vec![5]),
packet_report(1, 2, 1, vec![6]),
packet_report(1, 0, 24, vec![4], false),
packet_report(1, 1, 48, vec![5], false),
packet_report(1, 2, 1, vec![6], false),
join_packet_report(1, 3, 1, vec![4]),
// Packets for third OUI
packet_report(2, 0, 24, vec![7]),
packet_report(2, 0, 24, vec![7], false),
join_packet_report(2, 1, 1, vec![4]),
];
// Set up orgs:
Expand Down Expand Up @@ -328,14 +406,14 @@ async fn test_verifier() {
valid_packets,
vec![
// First two packets for OUI #0 are valid
valid_packet(0, 24, vec![1]),
valid_packet(1000, 48, vec![2]),
valid_packet(0, 24, vec![1], true),
valid_packet(1000, 48, vec![2], true),
// All packets for OUI #1 are valid
valid_packet(0, 24, vec![4]),
valid_packet(1000, 48, vec![5]),
valid_packet(2000, 1, vec![6]),
valid_packet(0, 24, vec![4], true),
valid_packet(1000, 48, vec![5], true),
valid_packet(2000, 1, vec![6], true),
// All packets for OUI #2 are valid
valid_packet(0, 24, vec![7]),
valid_packet(0, 24, vec![7], true),
]
);

Expand Down Expand Up @@ -398,10 +476,10 @@ async fn test_end_to_end() {
1,
pending_burns.clone(),
stream::iter(vec![
packet_report(0, 0, BYTES_PER_DC as u32, vec![1]),
packet_report(0, 1, BYTES_PER_DC as u32, vec![2]),
packet_report(0, 2, BYTES_PER_DC as u32, vec![3]),
packet_report(0, 3, BYTES_PER_DC as u32, vec![4]),
packet_report(0, 0, BYTES_PER_DC as u32, vec![1], false),
packet_report(0, 1, BYTES_PER_DC as u32, vec![2], false),
packet_report(0, 2, BYTES_PER_DC as u32, vec![3], false),
packet_report(0, 3, BYTES_PER_DC as u32, vec![4], false),
]),
&mut valid_packets,
&mut invalid_packets,
Expand All @@ -424,9 +502,9 @@ async fn test_end_to_end() {
assert_eq!(
valid_packets,
vec![
valid_packet(0, BYTES_PER_DC as u32, vec![1]),
valid_packet(1000, BYTES_PER_DC as u32, vec![2]),
valid_packet(2000, BYTES_PER_DC as u32, vec![3]),
valid_packet(0, BYTES_PER_DC as u32, vec![1], true),
valid_packet(1000, BYTES_PER_DC as u32, vec![2], true),
valid_packet(2000, BYTES_PER_DC as u32, vec![3], true),
]
);

Expand Down Expand Up @@ -477,7 +555,13 @@ async fn test_end_to_end() {
.verify(
1,
pending_burns.clone(),
stream::iter(vec![packet_report(0, 4, BYTES_PER_DC as u32, vec![5])]),
stream::iter(vec![packet_report(
0,
4,
BYTES_PER_DC as u32,
vec![5],
false,
)]),
&mut valid_packets,
&mut invalid_packets,
)
Expand Down
14 changes: 9 additions & 5 deletions iot_verifier/src/packet_loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,15 @@ impl PacketLoader {
file_info_stream
.into_stream(&mut transaction)
.await?
.map(|valid_packet| {
(
ValidPacket::from(valid_packet.clone()),
GatewayDCShare::share_from_packet(&valid_packet),
)
.filter_map(|valid_packet| async move {
if valid_packet.num_dcs > 0 {
Some((
ValidPacket::from(valid_packet.clone()),
GatewayDCShare::share_from_packet(&valid_packet),
))
} else {
None
}
})
.map(anyhow::Ok)
.try_fold(
Expand Down
Loading