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.

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

Coverage Point Calculator Integration with mobile-verifier #830

Merged
merged 42 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c119128
include coverage point calculator in mobile-verifier
michaeldjeffrey May 31, 2024
2d916a5
derive Debug for nested types
michaeldjeffrey May 31, 2024
17eee39
CoveragePoints uses CoveragePoint2 internally
michaeldjeffrey May 31, 2024
df04fdd
add coverage map to compute rank
michaeldjeffrey May 31, 2024
e297687
unignore mobile verifier integration tests
michaeldjeffrey May 31, 2024
0f136a0
update with rename SubscriberThreshold -> RadioThreshold
michaeldjeffrey May 31, 2024
3f554d3
filter for boosted hexes during report generation
michaeldjeffrey May 31, 2024
8af4dfc
calculator uses hex_assignments crate
michaeldjeffrey Jun 1, 2024
dc87785
clean values for reports
michaeldjeffrey Jun 1, 2024
9a78c72
Start adding coverage-map in mobile-verifier
michaeldjeffrey Jun 3, 2024
f80434a
break out coverage map for drop in replacement testing
michaeldjeffrey Jun 4, 2024
e18db32
Remove coverage map trait
michaeldjeffrey Jun 4, 2024
6ad9044
use RankedCoverage from coverage-map
michaeldjeffrey Jun 4, 2024
2fb1984
Skip a radio for rewards if it cannot be constructed properly
michaeldjeffrey Jun 4, 2024
fca62dd
use new coverage_map for testing
michaeldjeffrey Jun 5, 2024
fec7b71
bring up to date with coverage-point-calculator
michaeldjeffrey Jun 8, 2024
ab77338
remove unused fields now that coverage-map is stabilized
michaeldjeffrey Jun 8, 2024
75ef0d4
remove innner coverage map wrapper
michaeldjeffrey Jun 8, 2024
830b89b
rename after move from unwrapping
michaeldjeffrey Jun 8, 2024
2bdbc86
lift coverage points one more time
michaeldjeffrey Jun 8, 2024
055d4d4
starting to conslidate radio information into single map
michaeldjeffrey Jun 10, 2024
f3afac9
total coverage points is now provided pre-truncated
michaeldjeffrey Jun 10, 2024
e025f68
simplify coverage points to use only radio_infos
michaeldjeffrey Jun 11, 2024
6114221
hotspot_points no longer needs to be &mut self
michaeldjeffrey Jun 12, 2024
1ad133a
clean up trust_score construction and long types
michaeldjeffrey Jun 13, 2024
a7d6422
name test function more explicitly
michaeldjeffrey Jun 13, 2024
d2112f4
DateTime<Utc> implements Copy, no need to Clone
michaeldjeffrey Jun 13, 2024
17b8009
remove need for cloning radio_info
michaeldjeffrey Jun 13, 2024
88d7a3e
Remove replaced coverage point code
michaeldjeffrey Jun 13, 2024
811bbe2
rename coverage points constructor
michaeldjeffrey Jun 13, 2024
3b28098
remove async where possible from CoveragePoints
michaeldjeffrey Jun 13, 2024
751cedc
remove unneccessary `this` binding
michaeldjeffrey Jun 13, 2024
e7449e1
Rename CoveragePoints -> CoverageShares
michaeldjeffrey Jun 13, 2024
8ea92d4
remove unneeded derive for debug
michaeldjeffrey Jun 13, 2024
f7cc0a5
remove location trust score calculation
michaeldjeffrey Jun 13, 2024
4c5fa59
rename to differentiate argument from local bindings
michaeldjeffrey Jun 13, 2024
c93159b
construct coverage map inside block scope
michaeldjeffrey Jun 13, 2024
eb1b869
function call now small enough to inline
michaeldjeffrey Jun 13, 2024
bf9ee9d
Merged origin/main into mj/calculator-integration
michaeldjeffrey Jun 14, 2024
360981d
rename coverage variables to match with struct
michaeldjeffrey Jun 14, 2024
7f0dfae
Merged origin/main into mj/calculator-integration
michaeldjeffrey Jun 17, 2024
07f864c
handle potential lack of speedtest for radio
michaeldjeffrey Jun 17, 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 Cargo.lock

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

2 changes: 2 additions & 0 deletions mobile_verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ regex = "1"
humantime-serde = { workspace = true }
custom-tracing = { path = "../custom_tracing" }
hex-assignments = { path = "../hex_assignments" }
coverage-point-calculator = { path = "../coverage_point_calculator" }
coverage-map = { path = "../coverage_map" }

[dev-dependencies]
backon = "0"
4 changes: 2 additions & 2 deletions mobile_verifier/src/cli/reward_from_db.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
heartbeats::HeartbeatReward,
radio_threshold::VerifiedRadioThresholds,
reward_shares::{get_scheduled_tokens_for_poc, CoveragePoints},
reward_shares::{get_scheduled_tokens_for_poc, CoverageShares},
speedtests_average::SpeedtestAverages,
Settings,
};
Expand Down Expand Up @@ -41,7 +41,7 @@ impl Cmd {
let speedtest_averages =
SpeedtestAverages::aggregate_epoch_averages(epoch.end, &pool).await?;

let reward_shares = CoveragePoints::aggregate_points(
let reward_shares = CoverageShares::new(
&pool,
heartbeats,
&speedtest_averages,
Expand Down
Loading