Skip to content

Commit 18d308e

Browse files
committed
Merge branch 'port-token-module' into port-token-module-update
2 parents c799e58 + 26dc3aa commit 18d308e

File tree

8 files changed

+2119
-10
lines changed

8 files changed

+2119
-10
lines changed

.github/workflows/deployment-build-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77
paths:
88
- '.github/workflows/deployment-build-test.yaml'
99
- 'concordium-base'
10-
- 'deployment'
10+
- 'plt-deployment-unit'
1111

1212
pull_request:
1313
paths:
1414
- '.github/workflows/deployment-build-test.yaml'
1515
- 'concordium-base'
16-
- 'deployment'
16+
- 'plt-deployment-unit'
1717
env:
1818
CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
1919

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: PLT scheduler checks
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- '.github/workflows/deployment-build-test.yaml'
9+
- 'concordium-base'
10+
- 'plt-deployment-unit'
11+
- 'plt-scheduler'
12+
13+
pull_request:
14+
paths:
15+
- '.github/workflows/plt-scheduler-build-test.yaml'
16+
- 'concordium-base'
17+
- 'plt-deployment-unit'
18+
- 'plt-scheduler'
19+
env:
20+
CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
21+
22+
jobs:
23+
rustfmt:
24+
name: Check formatting
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v2
29+
with:
30+
submodules: recursive
31+
- name: Run rustfmt
32+
working-directory: plt-scheduler
33+
run: |
34+
rustup component add rustfmt
35+
cargo fmt -- --check
36+
37+
clippy_test:
38+
name: Run Clippy and tests
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
with:
44+
submodules: recursive
45+
- name: Clippy
46+
working-directory: plt-scheduler
47+
run: |
48+
rustup component add clippy
49+
cargo clippy --all-targets --all-features --locked -- -D warnings
50+
- name: Test
51+
working-directory: plt-scheduler
52+
run: cargo test --all-targets --all-features

plt-deployment-unit/src/token_module.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
use crate::host_interface::*;
33
use anyhow::anyhow;
44
use concordium_base::base::{AccountIndex, Energy};
5-
use concordium_base::common::Serial;
65
use concordium_base::common::cbor::value::Value;
76
use concordium_base::common::cbor::{
8-
CborSerializationError, SerializationOptions, UnknownMapKeys, cbor_decode_with_options,
9-
cbor_encode,
7+
cbor_decode_with_options, cbor_encode, CborSerializationError, SerializationOptions,
8+
UnknownMapKeys,
109
};
1110
use concordium_base::common::upward::{CborUpward, Upward};
11+
use concordium_base::common::Serial;
1212
use concordium_base::contracts_common::AccountAddress;
1313
use concordium_base::protocol_level_tokens::{
1414
CborHolderAccount, DeserializationFailureRejectReason, RawCbor, TokenAmount,
@@ -461,11 +461,11 @@ where
461461
let target_index = host.account_index(&target);
462462
host.set_account_state(target_index, STATE_KEY_ALLOW_LIST, Some(Vec::new()));
463463
}
464-
TokenOperation::RemoveAllowList(token_list_update_details) => todo!(),
465-
TokenOperation::AddDenyList(token_list_update_details) => todo!(),
466-
TokenOperation::RemoveDenyList(token_list_update_details) => todo!(),
467-
TokenOperation::Pause(token_pause_details) => todo!(),
468-
TokenOperation::Unpause(token_pause_details) => todo!(),
464+
TokenOperation::RemoveAllowList(_token_list_update_details) => todo!(),
465+
TokenOperation::AddDenyList(_token_list_update_details) => todo!(),
466+
TokenOperation::RemoveDenyList(_token_list_update_details) => todo!(),
467+
TokenOperation::Pause(_token_pause_details) => todo!(),
468+
TokenOperation::Unpause(_token_pause_details) => todo!(),
469469
}
470470
}
471471
Ok(())

0 commit comments

Comments
 (0)