Skip to content

Commit

Permalink
rename service provider selected to service provider override
Browse files Browse the repository at this point in the history
  • Loading branch information
@andymck
andymck committed Feb 12, 2025
1 parent f261c68 commit dcce99c
Show file tree
Hide file tree
Showing 19 changed files with 188 additions and 188 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion coverage_map/src/indoor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ mod test {
footfall: Assignment::A,
urbanized: Assignment::A,
landtype: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
}
}

Expand Down
2 changes: 1 addition & 1 deletion coverage_map/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ mod test {
footfall: Assignment::A,
urbanized: Assignment::A,
landtype: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
}
}

Expand Down
2 changes: 1 addition & 1 deletion coverage_map/src/outdoor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ mod test {
footfall: Assignment::A,
urbanized: Assignment::A,
landtype: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
}
}

Expand Down
6 changes: 3 additions & 3 deletions coverage_point_calculator/src/hexes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ mod tests {
footfall: Assignment::C,
landtype: Assignment::C,
urbanized: Assignment::C,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
boosted: NonZeroU32::new(0),
};
Expand Down Expand Up @@ -198,7 +198,7 @@ mod tests {
footfall: Assignment::A,
landtype: Assignment::A,
urbanized: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
boosted: NonZeroU32::new(0),
};
Expand Down Expand Up @@ -246,7 +246,7 @@ mod tests {
footfall: Assignment::C,
landtype: Assignment::C,
urbanized: Assignment::C,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
boosted: NonZeroU32::new(0),
};
Expand Down
56 changes: 28 additions & 28 deletions coverage_point_calculator/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,13 @@ mod tests {
}

#[rstest]
#[case::unboosted_sp_selected(0, dec!(400), true)]
#[case::minimum_boosted_sp_selected(1, dec!(400), true)]
#[case::boosted_sp_selected(5, dec!(2000), true)]
fn service_provider_selected_assignment_overrides_other_assignments(
#[case::unboosted_sp_override(0, dec!(400), true)]
#[case::minimum_boosted_sp_override(1, dec!(400), true)]
#[case::boosted_sp_override(5, dec!(2000), true)]
fn service_provider_override_assignment_overrides_other_assignments(
#[case] boost_multiplier: u32,
#[case] expected_points: Decimal,
#[case] service_provider_selected: bool,
#[case] service_provider_override: bool,
) {
let wifi = CoveragePoints::new(
RadioType::IndoorWifi,
Expand All @@ -429,7 +429,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_from(Assignment::C, service_provider_selected),
assignments: assignments_from(Assignment::C, service_provider_override),
boosted: NonZeroU32::new(boost_multiplier),
}],
OracleBoostingStatus::Eligible,
Expand All @@ -455,7 +455,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: NonZeroU32::new(5),
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -492,7 +492,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: NonZeroU32::new(5),
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -531,7 +531,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: NonZeroU32::new(5),
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -568,7 +568,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -629,7 +629,7 @@ mod tests {
footfall: Assignment,
landtype: Assignment,
urbanized: Assignment,
service_provider_selected: Assignment,
service_provider_override: Assignment,
) -> RankedCoverage {
RankedCoverage {
hotspot_key: pubkey(),
Expand All @@ -641,7 +641,7 @@ mod tests {
footfall,
landtype,
urbanized,
service_provider_selected,
service_provider_override,
},
boosted: None,
}
Expand Down Expand Up @@ -717,7 +717,7 @@ mod tests {
hex: hex_location(),
rank,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -748,7 +748,7 @@ mod tests {
hex: hex_location(),
rank,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
},
RankedCoverage {
Expand All @@ -757,7 +757,7 @@ mod tests {
hex: hex_location(),
rank: 2,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
},
RankedCoverage {
Expand All @@ -766,7 +766,7 @@ mod tests {
hex: hex_location(),
rank: 42,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
},
],
Expand All @@ -791,7 +791,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand All @@ -812,7 +812,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::High,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
},
RankedCoverage {
Expand All @@ -821,7 +821,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level: SignalLevel::Low,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: NonZeroU32::new(4),
},
];
Expand Down Expand Up @@ -860,7 +860,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -888,7 +888,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -918,7 +918,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -946,7 +946,7 @@ mod tests {
hex: hex_location(),
rank: 1,
signal_level,
assignments: assignments_maximum_no_sp_selected(),
assignments: assignments_maximum_no_sp_override(),
boosted: None,
}],
OracleBoostingStatus::Eligible,
Expand Down Expand Up @@ -986,17 +986,17 @@ mod tests {
hextree::Cell::from_raw(0x8c2681a3064edff).unwrap()
}

fn assignments_maximum_no_sp_selected() -> HexAssignments {
fn assignments_maximum_no_sp_override() -> HexAssignments {
HexAssignments {
footfall: Assignment::A,
landtype: Assignment::A,
urbanized: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
}
}

fn assignments_from(assignment: Assignment, service_provider_selected: bool) -> HexAssignments {
let service_provider_selected_assignment = if service_provider_selected {
fn assignments_from(assignment: Assignment, service_provider_override: bool) -> HexAssignments {
let service_provider_override_assignment = if service_provider_override {
Assignment::A
} else {
Assignment::C
Expand All @@ -1005,7 +1005,7 @@ mod tests {
footfall: assignment,
landtype: assignment,
urbanized: assignment,
service_provider_selected: service_provider_selected_assignment,
service_provider_override: service_provider_override_assignment,
}
}

Expand Down
8 changes: 4 additions & 4 deletions coverage_point_calculator/tests/coverage_point_calculator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn base_radio_coverage_points() {
footfall: Assignment::A,
landtype: Assignment::A,
urbanized: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
boosted: NonZeroU32::new(0),
}];
Expand Down Expand Up @@ -83,7 +83,7 @@ fn radios_with_coverage() {
footfall: Assignment::A,
landtype: Assignment::A,
urbanized: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
boosted: NonZeroU32::new(0),
};
Expand Down Expand Up @@ -428,7 +428,7 @@ fn ranked_coverage(hex: u64, rank: usize, signal_level: SignalLevel) -> RankedCo
footfall: Assignment::A,
landtype: Assignment::A,
urbanized: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
boosted: None,
signal_level,
Expand All @@ -444,7 +444,7 @@ fn unranked_coverage(hex: u64, signal_level: SignalLevel) -> UnrankedCoverage {
footfall: Assignment::A,
landtype: Assignment::A,
urbanized: Assignment::A,
service_provider_selected: Assignment::C,
service_provider_override: Assignment::C,
},
}
}
Loading

0 comments on commit dcce99c

Please sign in to comment.