Skip to content

Commit a22517e

Browse files
chris-olszewskichris-olszewski
authored
chore: remove unnecessary anyhow wrapping (#1247)
* chore: remove unnecessary anyhow wrapping from tests * remove anyhow wrapping from examples * fix lint
1 parent 3a6efc3 commit a22517e

15 files changed

Lines changed: 59 additions & 102 deletions

File tree

‎crates/sdk-core/tests/integ_tests/data_converter_tests.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ impl DataConverterTestWorkflow {
194194
input,
195195
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
196196
)
197-
.await
198-
.map_err(|e| anyhow::anyhow!("{e}"))?;
197+
.await?;
199198

200199
Ok(output)
201200
}
@@ -218,8 +217,7 @@ impl DescribeDataConverterWorkflow {
218217
input,
219218
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
220219
)
221-
.await
222-
.map_err(|e| anyhow::anyhow!("{e}"))?;
220+
.await?;
223221

224222
Ok(output)
225223
}

‎crates/sdk-core/tests/integ_tests/worker_tests.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ use temporalio_common::{
5555
use temporalio_macros::{activities, workflow, workflow_methods};
5656
use temporalio_sdk::{
5757
ActivityOptions, LocalActivityOptions, WorkerOptions, WorkflowContext, WorkflowResult,
58-
WorkflowTermination,
5958
activities::{ActivityContext, ActivityError},
6059
interceptors::WorkerInterceptor,
6160
};
@@ -419,15 +418,13 @@ async fn activity_tasks_from_completion_reserve_slots() {
419418
(),
420419
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
421420
)
422-
.await
423-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
421+
.await?;
424422
ctx.start_activity(
425423
FakeAct::act2,
426424
(),
427425
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
428426
)
429-
.await
430-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
427+
.await?;
431428
ctx.state(|wf| wf.complete_token.cancel());
432429
Ok(())
433430
}

‎crates/sdk-core/tests/integ_tests/workflow_tests.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,7 @@ impl SlowCompletesWf {
505505
"hi!".to_string(),
506506
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
507507
)
508-
.await
509-
.map_err(|e| anyhow::anyhow!("{e}"))?;
508+
.await?;
510509
ctx.timer(Duration::from_secs(1)).await;
511510
}
512511
Ok(())
@@ -881,8 +880,7 @@ async fn nondeterminism_errors_fail_workflow_when_configured_to(
881880
"hi".to_owned(),
882881
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
883882
)
884-
.await
885-
.map_err(|e| anyhow::anyhow!("{e}"))?;
883+
.await?;
886884
Ok(())
887885
}
888886
}
@@ -956,15 +954,13 @@ async fn history_out_of_order_on_restart() {
956954
..Default::default()
957955
},
958956
)
959-
.await
960-
.map_err(|e| anyhow::anyhow!("{e}"))?;
957+
.await?;
961958
ctx.start_activity(
962959
StdActivities::echo,
963960
"hi".to_string(),
964961
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
965962
)
966-
.await
967-
.map_err(|e| anyhow::anyhow!("{e}"))?;
963+
.await?;
968964
ctx.state(|wf| wf.hit_sleep.notify_one());
969965
ctx.timer(Duration::from_secs(5)).await;
970966
Ok(())
@@ -987,17 +983,15 @@ async fn history_out_of_order_on_restart() {
987983
..Default::default()
988984
},
989985
)
990-
.await
991-
.map_err(|e| anyhow::anyhow!("{e}"))?;
986+
.await?;
992987
// Timer is added after restarting workflow
993988
ctx.timer(Duration::from_secs(1)).await;
994989
ctx.start_activity(
995990
StdActivities::echo,
996991
"hi".to_string(),
997992
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
998993
)
999-
.await
1000-
.map_err(|e| anyhow::anyhow!("{e}"))?;
994+
.await?;
1001995
ctx.timer(Duration::from_secs(2)).await;
1002996
Ok(())
1003997
}

‎crates/sdk-core/tests/integ_tests/workflow_tests/activities.rs‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ impl OneActivityWorkflow {
7272
input,
7373
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
7474
)
75-
.await
76-
.map_err(|e| anyhow!("{e}"))?;
75+
.await?;
7776
Ok(r)
7877
}
7978
}
@@ -92,8 +91,7 @@ impl MultiArgActivityWorkflow {
9291
(input, " world".to_string()),
9392
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
9493
)
95-
.await
96-
.map_err(|e| anyhow!("{e}"))?;
94+
.await?;
9795
Ok(r)
9896
}
9997
}
@@ -172,18 +170,19 @@ async fn activity_panics_are_retryable() {
172170
impl ActivityPanicRetryWorkflow {
173171
#[run]
174172
async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<u32> {
175-
ctx.start_activity(
176-
PanicOnceActivities::panic_once,
177-
(),
178-
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(5))
179-
.retry_policy(RetryPolicy {
180-
maximum_attempts: 2,
181-
..Default::default()
182-
})
183-
.build(),
184-
)
185-
.await
186-
.map_err(|e| anyhow!("{e}").into())
173+
let result = ctx
174+
.start_activity(
175+
PanicOnceActivities::panic_once,
176+
(),
177+
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(5))
178+
.retry_policy(RetryPolicy {
179+
maximum_attempts: 2,
180+
..Default::default()
181+
})
182+
.build(),
183+
)
184+
.await?;
185+
Ok(result)
187186
}
188187
}
189188

‎crates/sdk-core/tests/integ_tests/workflow_tests/child_workflows.rs‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ impl HappyParent {
9393
)
9494
.await
9595
.expect("Child should start OK");
96-
started.result().await.map_err(|e| anyhow!(e).into())
96+
started.result().await?;
97+
Ok(())
9798
}
9899
}
99100

@@ -811,8 +812,7 @@ impl PassChildWorkflowSummaryToMetadata {
811812
..Default::default()
812813
},
813814
)
814-
.await
815-
.map_err(|e| anyhow!(e))?;
815+
.await?;
816816
Ok(())
817817
}
818818
}
@@ -920,7 +920,7 @@ impl ParentWf {
920920
_ => return Err(anyhow!("Expected start failure").into()),
921921
}
922922
}
923-
let started = start_res.map_err(|e| anyhow!(e))?;
923+
let started = start_res?;
924924
match (expectation, started.result().await) {
925925
(Expectation::Success, Ok(_)) => Ok(()),
926926
(Expectation::Failure, Err(ChildWorkflowExecutionError::Failed(failure))) => {
@@ -1274,13 +1274,9 @@ impl UntypedHappyParent {
12741274
..Default::default()
12751275
},
12761276
)
1277-
.await
1278-
.map_err(|e| anyhow!(e))?;
1279-
started
1280-
.result()
1281-
.await
1282-
.map(|_| ())
1283-
.map_err(|e| anyhow!(e).into())
1277+
.await?;
1278+
started.result().await?;
1279+
Ok(())
12841280
}
12851281
}
12861282

@@ -1416,8 +1412,7 @@ impl ChildSignalSerializationFailParent {
14161412
..Default::default()
14171413
},
14181414
)
1419-
.await
1420-
.map_err(|e| anyhow!(e))?;
1415+
.await?;
14211416

14221417
let signal_result = started
14231418
.signal(UnserializableSignalChild::bad_signal, AlwaysFailsSerialize)
@@ -1484,8 +1479,7 @@ impl UnitChildParentWf {
14841479
..Default::default()
14851480
},
14861481
)
1487-
.await
1488-
.map_err(|e| anyhow!(e))?;
1482+
.await?;
14891483
started.result().await?;
14901484
Ok(())
14911485
}

‎crates/sdk-core/tests/integ_tests/workflow_tests/determinism.rs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ impl TimerWfNondeterministic {
5757
(),
5858
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
5959
)
60-
.await
61-
.map_err(|e| anyhow::anyhow!("{e}"))?;
60+
.await?;
6261
}
6362
_ => panic!("Ran too many times"),
6463
}
@@ -290,12 +289,10 @@ impl ActivityIdOrTypeChangeWf {
290289
..Default::default()
291290
},
292291
)
293-
.await
294-
.map_err(|e| anyhow::anyhow!("{e}"))?;
292+
.await?;
295293
} else {
296294
ctx.start_local_activity(StdActivities::no_op, (), Default::default())
297-
.await
298-
.map_err(|e| anyhow::anyhow!("{e}"))?;
295+
.await?;
299296
}
300297
} else if id_change {
301298
ctx.start_activity(
@@ -305,16 +302,14 @@ impl ActivityIdOrTypeChangeWf {
305302
.activity_id("I'm bad and wrong!".to_string())
306303
.build(),
307304
)
308-
.await
309-
.map_err(|e| anyhow::anyhow!("{e}"))?;
305+
.await?;
310306
} else {
311307
ctx.start_activity(
312308
StdActivities::no_op,
313309
(),
314310
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
315311
)
316-
.await
317-
.map_err(|e| anyhow::anyhow!("{e}"))?;
312+
.await?;
318313
}
319314
Ok(())
320315
}

‎crates/sdk-core/tests/integ_tests/workflow_tests/local_activities.rs‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ use temporalio_macros::{activities, workflow, workflow_methods};
4848
use temporalio_sdk::{
4949
ActivityExecutionError, ActivityOptions, ApplicationFailure, CancellableFuture,
5050
LocalActivityOptions, WorkflowContext, WorkflowContextView, WorkflowResult,
51-
WorkflowTermination,
5251
activities::{ActivityContext, ActivityError},
5352
interceptors::{FailOnNondeterminismInterceptor, WorkerInterceptor},
5453
};
@@ -81,8 +80,7 @@ impl OneLocalActivityWf {
8180
"hi!".to_string(),
8281
LocalActivityOptions::default(),
8382
)
84-
.await
85-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
83+
.await?;
8684
assert!(initial_workflow_time < ctx.workflow_time().unwrap());
8785
Ok(())
8886
}
@@ -1128,8 +1126,7 @@ async fn long_local_activity_with_update(
11281126
Duration::from_secs(6),
11291127
LocalActivityOptions::default(),
11301128
)
1131-
.await
1132-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
1129+
.await?;
11331130
Ok(ctx.state(|wf| wf.update_counter))
11341131
}
11351132

@@ -1273,8 +1270,7 @@ impl LocalActivityWithSummaryWf {
12731270
..Default::default()
12741271
},
12751272
)
1276-
.await
1277-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
1273+
.await?;
12781274
Ok(())
12791275
}
12801276
}
@@ -1440,8 +1436,7 @@ async fn local_act_heartbeat(#[case] shutdown_middle: bool) {
14401436
"hi".to_string(),
14411437
LocalActivityOptions::default(),
14421438
)
1443-
.await
1444-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
1439+
.await?;
14451440
Ok(())
14461441
}
14471442
}
@@ -1662,8 +1657,7 @@ async fn local_act_null_result() {
16621657
#[run(name = DEFAULT_WORKFLOW_TYPE)]
16631658
async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
16641659
ctx.start_local_activity(StdActivities::default, (), LocalActivityOptions::default())
1665-
.await
1666-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
1660+
.await?;
16671661
Ok(())
16681662
}
16691663
}
@@ -1699,8 +1693,7 @@ async fn local_act_command_immediately_follows_la_marker() {
16991693
#[run(name = DEFAULT_WORKFLOW_TYPE)]
17001694
async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
17011695
ctx.start_local_activity(StdActivities::default, (), LocalActivityOptions::default())
1702-
.await
1703-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
1696+
.await?;
17041697
ctx.timer(Duration::from_secs(1)).await;
17051698
Ok(())
17061699
}
@@ -2319,8 +2312,7 @@ async fn resolved_las_not_recorded_if_wft_fails_many_times() {
23192312
..Default::default()
23202313
},
23212314
)
2322-
.await
2323-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
2315+
.await?;
23242316
panic!()
23252317
}
23262318
}
@@ -2870,11 +2862,9 @@ impl TwoLaWf {
28702862
#[run(name = DEFAULT_WORKFLOW_TYPE)]
28712863
async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
28722864
ctx.start_local_activity(StdActivities::default, (), LocalActivityOptions::default())
2873-
.await
2874-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
2865+
.await?;
28752866
ctx.start_local_activity(StdActivities::default, (), LocalActivityOptions::default())
2876-
.await
2877-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
2867+
.await?;
28782868
Ok(())
28792869
}
28802870
}
@@ -3007,12 +2997,10 @@ impl LaTimerLaWf {
30072997
#[run(name = DEFAULT_WORKFLOW_TYPE)]
30082998
async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
30092999
ctx.start_local_activity(StdActivities::default, (), LocalActivityOptions::default())
3010-
.await
3011-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
3000+
.await?;
30123001
ctx.timer(Duration::from_secs(5)).await;
30133002
ctx.start_local_activity(StdActivities::default, (), LocalActivityOptions::default())
3014-
.await
3015-
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
3003+
.await?;
30163004
Ok(())
30173005
}
30183006
}

‎crates/sdk-core/tests/integ_tests/workflow_tests/resets.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ impl ResetRandomseedWf {
152152
"hi!".to_string(),
153153
LocalActivityOptions::default(),
154154
)
155-
.await
156-
.map_err(|e| anyhow::anyhow!("{e}"))?;
155+
.await?;
157156
}
158157
ctx.wait_condition(|s| s.post_fail_received).await;
159158
ctx.state(|wf| wf.notify.notify_one());

‎crates/sdk/examples/activity_heartbeating/workflows.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ impl HeartbeatingWorkflow {
5252
.heartbeat_timeout(Duration::from_secs(5))
5353
.build(),
5454
)
55-
.await
56-
.map_err(|e| anyhow::anyhow!("{e}"))?;
55+
.await?;
5756
Ok(result)
5857
}
5958
}

0 commit comments

Comments
 (0)