Skip to content

Commit 5511e9a

Browse files
elpielelpiel
committed
sentry - routes - campaign create and modify tests
1 parent 9b3a375 commit 5511e9a

File tree

2 files changed

+18
-52
lines changed

2 files changed

+18
-52
lines changed

‎sentry/src/routes/campaign.rs

Lines changed: 18 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,6 @@ mod test {
12551255
};
12561256
use adapter::primitives::Deposit;
12571257
use chrono::{TimeZone, Utc};
1258-
use hyper::StatusCode;
12591258
use primitives::{
12601259
campaign::validators::Validators,
12611260
config::GANACHE_CONFIG,
@@ -1268,12 +1267,13 @@ mod test {
12681267
ValidatorDesc, ValidatorId,
12691268
};
12701269

1271-
#[tokio::test]
12721270
/// Test single campaign creation and modification
12731271
// &
12741272
/// Test with multiple campaigns (because of Budget) and modifications
1273+
#[tokio::test]
12751274
async fn create_and_modify_with_multiple_campaigns() {
1276-
let app = setup_dummy_app().await;
1275+
let app_guard = setup_dummy_app().await;
1276+
let app = Extension(Arc::new(app_guard.app.clone()));
12771277

12781278
// Create a new Campaign with different CampaignId
12791279
let dummy_channel = DUMMY_CAMPAIGN.channel;
@@ -1296,45 +1296,29 @@ mod test {
12961296
},
12971297
);
12981298

1299-
let build_request = |create_campaign: CreateCampaign| -> Request<Body> {
1300-
let auth = Auth {
1301-
era: 0,
1302-
uid: ValidatorId::from(create_campaign.creator),
1303-
chain: channel_context.chain.clone(),
1304-
};
1305-
1306-
let body =
1307-
Body::from(serde_json::to_string(&create_campaign).expect("Should serialize"));
1308-
1309-
Request::builder()
1310-
.extension(auth)
1311-
.body(body)
1312-
.expect("Should build Request")
1313-
};
1299+
let auth = Extension(Auth {
1300+
era: 0,
1301+
uid: IDS[&CREATOR],
1302+
chain: channel_context.chain.clone(),
1303+
});
13141304

13151305
let campaign_context: ChainOf<Campaign> = {
13161306
// erases the CampaignId for the CreateCampaign request
13171307
let mut create = CreateCampaign::from_campaign_erased(DUMMY_CAMPAIGN.clone(), None);
13181308
create.budget = UnifiedNum::from_whole(500);
13191309

1320-
let create_response = create_campaign(build_request(create), &app)
1321-
.await
1322-
.expect("Should create campaign");
1323-
1324-
assert_eq!(StatusCode::OK, create_response.status());
1325-
let json = hyper::body::to_bytes(create_response.into_body())
1310+
let create_response = create_campaign_axum(Json(create), auth.clone(), app.clone())
13261311
.await
1327-
.expect("Should get json");
1312+
.expect("Should create campaign")
1313+
.0;
13281314

1329-
let campaign: Campaign =
1330-
serde_json::from_slice(&json).expect("Should get new Campaign");
13311315

1332-
assert_ne!(DUMMY_CAMPAIGN.id, campaign.id);
1316+
assert_ne!(DUMMY_CAMPAIGN.id, create_response.id);
13331317

13341318
let campaign_remaining = CampaignRemaining::new(app.redis.clone());
13351319

13361320
let remaining = campaign_remaining
1337-
.get_remaining_opt(campaign.id)
1321+
.get_remaining_opt(create_response.id)
13381322
.await
13391323
.expect("Should get remaining from redis")
13401324
.expect("There should be value for the Campaign");
@@ -1344,7 +1328,7 @@ mod test {
13441328
UnifiedNum::from(remaining.unsigned_abs())
13451329
);
13461330

1347-
channel_context.clone().with(campaign)
1331+
channel_context.clone().with(create_response)
13481332
};
13491333

13501334
// modify campaign
@@ -1391,19 +1375,9 @@ mod test {
13911375
CreateCampaign::from_campaign_erased(DUMMY_CAMPAIGN.clone(), None);
13921376
create_second.budget = UnifiedNum::from_whole(500);
13931377

1394-
let create_response = create_campaign(build_request(create_second), &app)
1395-
.await
1396-
.expect("Should create campaign");
1397-
1398-
assert_eq!(StatusCode::OK, create_response.status());
1399-
let json = hyper::body::to_bytes(create_response.into_body())
1378+
create_campaign_axum(Json(create_second), auth.clone(), app.clone())
14001379
.await
1401-
.expect("Should get json");
1402-
1403-
let second_campaign: Campaign =
1404-
serde_json::from_slice(&json).expect("Should get new Campaign");
1405-
1406-
second_campaign
1380+
.expect("Should create campaign").0
14071381
};
14081382

14091383
// No budget left for new campaigns
@@ -1414,7 +1388,7 @@ mod test {
14141388
let mut create = CreateCampaign::from_campaign_erased(DUMMY_CAMPAIGN.clone(), None);
14151389
create.budget = UnifiedNum::from_whole(600);
14161390

1417-
let create_err = create_campaign(build_request(create), &app)
1391+
let create_err = create_campaign_axum(Json(create), auth.clone(), app.clone())
14181392
.await
14191393
.expect_err("Should return Error response");
14201394

@@ -1463,16 +1437,9 @@ mod test {
14631437
let mut create = CreateCampaign::from_campaign_erased(DUMMY_CAMPAIGN.clone(), None);
14641438
create.budget = UnifiedNum::from_whole(600);
14651439

1466-
let create_response = create_campaign(build_request(create), &app)
1440+
let _create_response = create_campaign_axum(Json(create), auth.clone(), app.clone())
14671441
.await
14681442
.expect("Should return create campaign");
1469-
1470-
let json = hyper::body::to_bytes(create_response.into_body())
1471-
.await
1472-
.expect("Should get json");
1473-
1474-
let _campaign: Campaign =
1475-
serde_json::from_slice(&json).expect("Should get new Campaign");
14761443
}
14771444

14781445
// Modify a campaign without enough budget

‎sentry/src/routes/channel.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,6 @@ mod test {
935935
use hyper::StatusCode;
936936
use primitives::{
937937
channel::Nonce,
938-
sentry::channel_list::ChannelListResponse,
939938
test_util::{
940939
ADVERTISER, CREATOR, DUMMY_CAMPAIGN, FOLLOWER, GUARDIAN, IDS, LEADER, LEADER_2,
941940
PUBLISHER, PUBLISHER_2,

0 commit comments

Comments
 (0)