Skip to content

Commit aa57d56

Browse files
simzzzsimzzz
committed
requested changes except Duration serialization
1 parent c9760ca commit aa57d56

File tree

6 files changed

+105
-96
lines changed

6 files changed

+105
-96
lines changed

‎primitives/examples/get_cfg_response.rs

Lines changed: 59 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,68 @@ use serde_json::{from_value, json};
33

44
fn main() {
55
let json = json!({
6-
"max_channels":512,
7-
"channels_find_limit":200,
8-
"campaigns_find_limit":200,
9-
"spendable_find_limit":200,
10-
"wait_time":500,
11-
"msgs_find_limit":10,
12-
"analytics_find_limit":5000,
13-
"analytics_maxtime":20000,
14-
"heartbeat_time":30000,
15-
"health_threshold_promilles":950,
16-
"health_unsignable_promilles":750,
17-
"propagation_timeout":2000,
18-
"fetch_timeout":5000,
19-
"all_campaigns_timeout":5000,
20-
"channel_tick_timeout":8000,
21-
"ip_rate_limit":{"type":"ip","timeframe":1200000},
22-
"creators_whitelist":[],
23-
"validators_whitelist":[],
24-
"admins":["0x80690751969B234697e9059e04ed72195c3507fa"],
25-
"chain":{
26-
"Ganache #1337": {
27-
"chain_id":1337,
28-
"rpc":"http://localhost:1337/",
29-
"outpace":"0xAbc27d46a458E2e49DaBfEf45ca74dEDBAc3DD06",
30-
"token":{
31-
"Mocked TOKEN 1337":{
32-
"min_campaign_budget":"1000000000000000000",
33-
"min_validator_fee":"1000000000000",
34-
"precision":18,
35-
"address":"0x2BCaf6968aEC8A3b5126FBfAb5Fd419da6E8AD8E"
36-
}
37-
}
38-
},
39-
"Ganache #1":{
40-
"chain_id":1,
41-
"rpc":"http://localhost:8545/",
42-
"outpace":"0x26CBc2eAAe377f6Ac4b73a982CD1125eF4CEC96f",
43-
"token":{
44-
"Mocked TOKEN 1":{
45-
"min_campaign_budget":"1000000000000000000",
46-
"min_validator_fee":"1000000000000",
47-
"precision":18,
48-
"address":"0x12a28f2bfBFfDf5842657235cC058242f40fDEa6"
49-
}
50-
}
6+
"max_channels": 512,
7+
"channels_find_limit": 200,
8+
"campaigns_find_limit": 200,
9+
"spendable_find_limit": 200,
10+
"wait_time": 500,
11+
"msgs_find_limit": 10,
12+
"analytics_find_limit": 5000,
13+
"analytics_maxtime": 20000,
14+
"heartbeat_time": 30000,
15+
"health_threshold_promilles": 950,
16+
"health_unsignable_promilles": 750,
17+
"propagation_timeout": 2000,
18+
"fetch_timeout": 5000,
19+
"all_campaigns_timeout": 5000,
20+
"channel_tick_timeout": 8000,
21+
"ip_rate_limit": {
22+
"type": "ip",
23+
"timeframe": 1200000
24+
},
25+
"creators_whitelist": [],
26+
"validators_whitelist": [],
27+
"admins": [
28+
"0x80690751969B234697e9059e04ed72195c3507fa"
29+
],
30+
"chain": {
31+
"Ganache #1337": {
32+
"chain_id": 1337,
33+
"rpc": "http://localhost:1337/",
34+
"outpace": "0xAbc27d46a458E2e49DaBfEf45ca74dEDBAc3DD06",
35+
"token": {
36+
"Mocked TOKEN 1337": {
37+
"min_campaign_budget": "1000000000000000000",
38+
"min_validator_fee": "1000000000000",
39+
"precision": 18,
40+
"address": "0x2BCaf6968aEC8A3b5126FBfAb5Fd419da6E8AD8E"
41+
}
42+
}
43+
},
44+
"Ganache #1": {
45+
"chain_id": 1,
46+
"rpc": "http://localhost:8545/",
47+
"outpace": "0x26CBc2eAAe377f6Ac4b73a982CD1125eF4CEC96f",
48+
"token": {
49+
"Mocked TOKEN 1": {
50+
"min_campaign_budget": "1000000000000000000",
51+
"min_validator_fee": "1000000000000",
52+
"precision": 18,
53+
"address": "0x12a28f2bfBFfDf5842657235cC058242f40fDEa6"
54+
}
5155
}
56+
}
5257
},
53-
"platform":{
54-
"url":"https://platform.adex.network/",
55-
"keep_alive_interval":1200000
58+
"platform": {
59+
"url": "https://platform.adex.network/",
60+
"keep_alive_interval": 1200000
5661
},
57-
"limits":{
58-
"units_for_slot":{
59-
"max_campaigns_earning_from":25,
60-
"global_min_impression_price":"1000000"
61-
}
62+
"limits": {
63+
"units_for_slot": {
64+
"max_campaigns_earning_from": 25,
65+
"global_min_impression_price": "1000000"
66+
}
6267
}
63-
});
68+
});
6469
assert!(from_value::<Config>(json).is_ok());
6570
}

‎sentry/src/db/analytics.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use tokio_postgres::{types::ToSql, Row};
99

1010
use super::{DbPool, PoolError};
1111

12-
pub async fn get_analytics(
12+
pub async fn fetch_analytics(
1313
pool: &DbPool,
1414
query: AnalyticsQuery,
1515
allowed_keys: HashSet<AllowedKey>,
@@ -180,7 +180,7 @@ mod test {
180180
use crate::db::tests_postgres::{setup_test_migrations, DATABASE_POOL};
181181

182182
#[tokio::test]
183-
async fn insert_update_and_get_analytics() {
183+
async fn insert_update_and_fetch_analytics() {
184184
let database = DATABASE_POOL.get().await.expect("Should get a DB pool");
185185

186186
let ad_unit = DUMMY_AD_UNITS[0].clone();
@@ -393,7 +393,7 @@ mod test {
393393

394394
// Impression query - should count all inserted Analytics
395395
{
396-
let count_impressions = get_analytics(
396+
let count_impressions = fetch_analytics(
397397
&database.pool,
398398
impression_query.clone(),
399399
ALLOWED_KEYS.clone(),
@@ -436,7 +436,7 @@ mod test {
436436
let mut paid_impressions_query = impression_query.clone();
437437
paid_impressions_query.metric = Metric::Paid;
438438

439-
let paid_impressions = get_analytics(
439+
let paid_impressions = fetch_analytics(
440440
&database.pool,
441441
paid_impressions_query,
442442
ALLOWED_KEYS.clone(),
@@ -498,7 +498,7 @@ mod test {
498498

499499
// Click query - should count all inserted Analytics
500500
{
501-
let count_clicks = get_analytics(
501+
let count_clicks = fetch_analytics(
502502
&database.pool,
503503
click_query.clone(),
504504
ALLOWED_KEYS.clone(),
@@ -541,7 +541,7 @@ mod test {
541541
let mut paid_clicks_query = impression_query.clone();
542542
paid_clicks_query.metric = Metric::Paid;
543543

544-
let paid_impressions = get_analytics(
544+
let paid_impressions = fetch_analytics(
545545
&database.pool,
546546
paid_clicks_query,
547547
ALLOWED_KEYS.clone(),
@@ -595,7 +595,7 @@ mod test {
595595
};
596596
click_germany_query.country = Some("Germany".into());
597597

598-
let count_clicks = get_analytics(
598+
let count_clicks = fetch_analytics(
599599
&database.pool,
600600
click_germany_query.clone(),
601601
ALLOWED_KEYS.clone(),
@@ -646,7 +646,7 @@ mod test {
646646
chains: vec![],
647647
};
648648

649-
let count_impressions = get_analytics(
649+
let count_impressions = fetch_analytics(
650650
&database.pool,
651651
ad_unit_2_query.clone(),
652652
ALLOWED_KEYS.clone(),
@@ -702,7 +702,7 @@ mod test {
702702
chains: vec![],
703703
};
704704

705-
let count_impressions = get_analytics(
705+
let count_impressions = fetch_analytics(
706706
&database.pool,
707707
filter_by_publisher_2_query.clone(),
708708
ALLOWED_KEYS.clone(),
@@ -758,7 +758,7 @@ mod test {
758758
chains: vec![],
759759
};
760760

761-
let count_impressions = get_analytics(
761+
let count_impressions = fetch_analytics(
762762
&database.pool,
763763
authenticate_as_publisher_2_query.clone(),
764764
ALLOWED_KEYS.clone(),
@@ -814,7 +814,7 @@ mod test {
814814
chains: vec![],
815815
};
816816

817-
let count_impressions = get_analytics(
817+
let count_impressions = fetch_analytics(
818818
&database.pool,
819819
segment_ad_units_query.clone(),
820820
ALLOWED_KEYS.clone(),

‎sentry/src/routes.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
//! - [GET `/v5/analytics/for-publisher`](#get-v5analyticsfor-publisher-auth-required) (auth required)
3030
//! - [GET `/v5/analytics/for-advertiser`](#get-v5analyticsfor-advertiser-auth-required) (auth required)
3131
//! - [GET `/v5/analytics/for-admin`](#get-v5analyticsfor-admin-auth-required) (auth required)
32+
//! - [Config](#config) route
33+
//! - [GET `/cfg`](#get-cfg)
3234
//!
3335
//! ## Channel
3436
//!
@@ -475,11 +477,13 @@
475477
//!
476478
//! See [GET `/v5/analytics`](#get-v5analytics)
477479
//!
480+
//! ## Config
481+
//!
478482
//! #### GET `/cfg`
479483
//!
480484
//! Gets the config that the validator is running on.
481485
//!
482-
//! The route is handled by [`config()`](crate::routes::get_cfg())
486+
//! The route is handled by [`get_cfg()`](crate::routes::get_cfg())
483487
//!
484488
//! Response: [`Config`](primitives::Config)
485489
//!
@@ -521,9 +525,9 @@
521525
//! [`SuccessResponse`]: primitives::sentry::SuccessResponse
522526
//! [`ValidatorId`]: primitives::ValidatorId
523527
524-
pub use analytics::analytics as get_analytics;
528+
pub use analytics::get_analytics;
525529

526-
pub use cfg::config as get_cfg;
530+
pub use cfg::get_cfg;
527531

528532
// `analytics` module has single request, so we only export this request
529533
mod analytics;

0 commit comments

Comments
 (0)