Skip to content

fix(task-registry): use dedicated Cancelled status instead of Expired… #13

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.

Sign up for GitHub

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

Merged
cybermax4200 merged 1 commit into from
Jul 13, 2026
Merged

fix(task-registry): use dedicated Cancelled status instead of Expired… #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 39 additions & 2 deletions contracts/task-registry/src/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ impl RegistryContract {
panic!("registry: task is not active");
}

task.status = TaskStatus::Expired;
task.status = TaskStatus::Cancelled;
storage::write_task(&e, &task);

TaskCancelledEvent {
Expand Down Expand Up @@ -512,7 +512,7 @@ mod test {
client.cancel_task(&admin, &task_id);

let task = client.get_task(&task_id);
assert_eq!(task.status, TaskStatus::Expired);
assert_eq!(task.status, TaskStatus::Cancelled);
}

#[test]
Expand Down Expand Up @@ -552,6 +552,43 @@ mod test {
client.cancel_task(&admin, &task_id);
}

#[test]
#[should_panic(expected = "registry: task is not active")]
fn test_complete_cancelled_task() {
let (e, admin, client) = setup();
e.mock_all_auths();

let user = Address::generate(&e);
let task_id = create_test_task(
&client,
&admin,
&String::from_str(&e, "tree-planting"),
2,
1000,
);

client.cancel_task(&admin, &task_id);
client.complete_task(&admin, &task_id, &user);
}

#[test]
#[should_panic(expected = "registry: task is not active")]
fn test_expire_cancelled_task() {
let (e, admin, client) = setup();
e.mock_all_auths();

let task_id = create_test_task(
&client,
&admin,
&String::from_str(&e, "tree-planting"),
1,
1000,
);

client.cancel_task(&admin, &task_id);
client.expire_task(&admin, &task_id);
}

#[test]
fn test_get_tasks_by_creator() {
let (e, admin, client) = setup();
Expand Down
1 change: 1 addition & 0 deletions contracts/task-registry/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub enum TaskStatus {
Active,
Completed,
Expired,
Cancelled,
}

#[derive(Clone, Debug)]
Expand Down
4 changes: 2 additions & 2 deletions contracts/task-registry/test_snapshots/registry/test/test_add_sponsor.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"string": "tree-planting"
},
{
"bytes": "58702fa6896e30ea4e37ae7b81e50d7d13281fb69438d9ed38865f5f9e48590c"
"bytes": "8724990dc2fc7e6bbf64e3c87b245ff1982a28f38ec6bbae54f0434465c86ae8"
},
{
"i128": "1000"
Expand Down Expand Up @@ -191,7 +191,7 @@
"symbol": "location_hash"
},
"val": {
"bytes": "58702fa6896e30ea4e37ae7b81e50d7d13281fb69438d9ed38865f5f9e48590c"
"bytes": "8724990dc2fc7e6bbf64e3c87b245ff1982a28f38ec6bbae54f0434465c86ae8"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...acts/task-registry/test_snapshots/registry/test/test_cancel_already_completed_task.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"string": "tree-planting"
},
{
"bytes": "6637d6b2768119be6cec82d6f1ae50de96cef74cb89f962a672ba453f9e1cb25"
"bytes": "302fd88a502120f680f7dbf7201fb9b8830685ef9ee90f96c45fda9f9251a12e"
},
{
"i128": "1000"
Expand Down Expand Up @@ -244,7 +244,7 @@
"symbol": "location_hash"
},
"val": {
"bytes": "6637d6b2768119be6cec82d6f1ae50de96cef74cb89f962a672ba453f9e1cb25"
"bytes": "302fd88a502120f680f7dbf7201fb9b8830685ef9ee90f96c45fda9f9251a12e"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions contracts/task-registry/test_snapshots/registry/test/test_cancel_task_by_creator.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"string": "tree-planting"
},
{
"bytes": "3ea3ce6109d34eb3ebbbf12cfd0ee5a183c7b817f97737e259cfe1a569b4b043"
"bytes": "a8ca1cea466767acb0dd9316e8be843a683920a9d3032d046390fe62a430fc5d"
},
{
"i128": "1000"
Expand Down Expand Up @@ -211,7 +211,7 @@
"symbol": "location_hash"
},
"val": {
"bytes": "3ea3ce6109d34eb3ebbbf12cfd0ee5a183c7b817f97737e259cfe1a569b4b043"
"bytes": "a8ca1cea466767acb0dd9316e8be843a683920a9d3032d046390fe62a430fc5d"
}
},
{
Expand All @@ -237,7 +237,7 @@
"val": {
"vec": [
{
"symbol": "Expired"
"symbol": "Cancelled"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/task-registry/test_snapshots/registry/test/test_cancel_task_not_creator.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"string": "tree-planting"
},
{
"bytes": "02e012f69ff8ab7b34bef8aa6b88921320de232e3d07bde7e901586ad2a9993d"
"bytes": "4d45bf901961e6dce6e24dcf426ba2f781d54cf26a41dc66e7eaabbeb3a8af3c"
},
{
"i128": "1000"
Expand Down Expand Up @@ -169,7 +169,7 @@
"symbol": "location_hash"
},
"val": {
"bytes": "02e012f69ff8ab7b34bef8aa6b88921320de232e3d07bde7e901586ad2a9993d"
"bytes": "4d45bf901961e6dce6e24dcf426ba2f781d54cf26a41dc66e7eaabbeb3a8af3c"
}
},
{
Expand Down
Loading
Loading