Skip to content

Commit 2b0c8e2

Browse files
committed
transit: Remove Abilities::ALL_ABILITIES
1 parent d181847 commit 2b0c8e2

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

src/core/test.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,10 @@ pub async fn test_file_rust2rust() {
249249
code_tx.send(mailbox_connection.code.clone()).unwrap();
250250
let wormhole = crate::Wormhole::connect(mailbox_connection).await?;
251251
eyre::Result::<_>::Ok(
252-
#[expect(deprecated)]
253252
transfer::send(
254253
wormhole,
255254
default_relay_hints(),
256-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
255+
magic_wormhole::transit::Abilities::ALL,
257256
offer,
258257
&log_transit_connection,
259258
|_sent, _total| {},
@@ -281,7 +280,7 @@ pub async fn test_file_rust2rust() {
281280
/*let transfer::ReceiveRequest::V1(req) = transfer::request(
282281
wormhole,
283282
default_relay_hints(),
284-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
283+
magic_wormhole::transit::Abilities::ALL,
285284
futures::future::pending(),
286285
)
287286
.await?
@@ -292,7 +291,7 @@ pub async fn test_file_rust2rust() {
292291
let req = transfer::request_file(
293292
wormhole,
294293
default_relay_hints(),
295-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
294+
magic_wormhole::transit::Abilities::ALL,
296295
futures::future::pending(),
297296
)
298297
.await?
@@ -347,11 +346,10 @@ pub async fn test_send_many() {
347346
let wormhole = crate::Wormhole::connect(mailbox).await?;
348347
senders.push(async_std::task::spawn_local(async move {
349348
eyre::Result::Ok(
350-
#[expect(deprecated)]
351349
crate::transfer::send(
352350
wormhole,
353351
default_relay_hints(),
354-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
352+
magic_wormhole::transit::Abilities::ALL,
355353
gen_offer().await?,
356354
&log_transit_connection,
357355
|_, _| {},
@@ -376,11 +374,10 @@ pub async fn test_send_many() {
376374
let gen_offer = gen_offer.clone();
377375
senders.push(async_std::task::spawn_local(async move {
378376
eyre::Result::Ok(
379-
#[expect(deprecated)]
380377
crate::transfer::send(
381378
wormhole,
382379
default_relay_hints(),
383-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
380+
magic_wormhole::transit::Abilities::ALL,
384381
gen_offer().await?,
385382
&log_transit_connection,
386383
|_, _| {},
@@ -409,7 +406,7 @@ pub async fn test_send_many() {
409406
/*let transfer::ReceiveRequest::V1(req) = crate::transfer::request(
410407
wormhole,
411408
default_relay_hints(),
412-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
409+
magic_wormhole::transit::Abilities::ALL,
413410
futures::future::pending(),
414411
)
415412
.await?
@@ -420,7 +417,7 @@ pub async fn test_send_many() {
420417
let req = transfer::request_file(
421418
wormhole,
422419
default_relay_hints(),
423-
magic_wormhole::transit::Abilities::ALL_ABILITIES,
420+
magic_wormhole::transit::Abilities::ALL,
424421
futures::future::pending(),
425422
)
426423
.await

src/forwarding.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub const APP_CONFIG: crate::AppConfig<AppVersion> = crate::AppConfig::<AppVersi
4040
id: AppID(Cow::Borrowed(APPID_RAW)),
4141
rendezvous_url: Cow::Borrowed(crate::rendezvous::DEFAULT_RENDEZVOUS_SERVER),
4242
app_version: AppVersion {
43-
transit_abilities: transit::Abilities::ALL_ABILITIES,
43+
transit_abilities: transit::Abilities::ALL,
4444
other: serde_json::Value::Null,
4545
},
4646
};

src/transfer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl AppVersionTransferV2Hint {
218218
const fn new() -> Self {
219219
Self {
220220
supported_formats: Cow::Borrowed(&[Cow::Borrowed("plain"), Cow::Borrowed("tar")]),
221-
transit_abilities: transit::Abilities::ALL_ABILITIES,
221+
transit_abilities: transit::Abilities::ALL,
222222
}
223223
}
224224
}
@@ -673,7 +673,7 @@ mod test {
673673
#[test]
674674
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
675675
fn test_transit() {
676-
let abilities = Abilities::ALL_ABILITIES;
676+
let abilities = Abilities::ALL;
677677
let hints = transit::Hints::new(
678678
[DirectHint::new("192.168.1.8", 46295)],
679679
[RelayHint::new(

src/transit.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@ impl Abilities {
154154
noise_v1: false,
155155
};
156156

157-
/// The abilities preset that contains all abilities
158-
#[deprecated(since = "0.7.0", note = "use Abilities::ALL")]
159-
pub const ALL_ABILITIES: Self = Self::ALL;
160-
161157
/**
162158
* If you absolutely don't want to use any relay servers.
163159
*

0 commit comments

Comments
 (0)