Skip to content

Commit c67e3eb

Browse files
committed
fix comments
1 parent a7d86d1 commit c67e3eb

File tree

25 files changed

+724
-1431
lines changed

25 files changed

+724
-1431
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,21 +296,27 @@ jobs:
296296
runs-on: ubuntu-latest
297297
steps:
298298
- name: Checkout the core repository
299-
uses: actions/checkout@v4
299+
uses: actions/checkout@v5
300300
with:
301301
submodules: recursive
302302
path: ./mintlayer-core
303+
303304
- name: Update local dependency repositories
304305
run: sudo apt-get update
306+
305307
- name: Install build dependencies
306308
run: sudo apt-get install -yqq --no-install-recommends build-essential pkg-config libdbus-1-dev libusb-1.0-0-dev
309+
307310
- name: Install rust
308311
run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
312+
309313
- name: Install cargo-nextest
310314
uses: taiki-e/install-action@nextest
315+
311316
- name: Build and archive the tests
312317
run: cargo nextest archive --release --locked -p wallet --features enable-ledger-device-tests --archive-file ledger-tests.tar.zst
313318
working-directory: ./mintlayer-core
319+
314320
- name: Upload archived tests
315321
uses: actions/upload-artifact@v4
316322
with:
@@ -324,32 +330,37 @@ jobs:
324330
runs-on: ubuntu-latest
325331
strategy:
326332
matrix:
327-
model: [flex, stax, nanox, nanosplus]
333+
model: [apex_p, flex, stax, nanox, nanosplus]
328334
steps:
329335
- name: Checkout the core repository
330-
uses: actions/checkout@v4
336+
uses: actions/checkout@v5
331337
with:
332338
submodules: recursive
333339
path: ./mintlayer-core
340+
334341
- name: Checkout mintlayer-ledger-app repository
335-
uses: actions/checkout@v4
342+
uses: actions/checkout@v5
336343
with:
337344
repository: mintlayer/mintlayer-ledger-app
338345
ref: feature/mintlayer-app
339346
path: ./mintlayer-ledger-app
347+
340348
- name: Download archived tests
341349
uses: actions/download-artifact@v4
342350
with:
343351
name: archived-ledger-tests
344352
path: ./mintlayer-core
353+
345354
- name: Install cargo-nextest
346355
uses: taiki-e/install-action@nextest
356+
347357
- name: Build Ledger app in container
348358
run: |
349359
sudo docker run --rm \
350360
-v "$(realpath ./mintlayer-ledger-app):/app" \
351361
ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest \
352362
sh -c 'cargo ledger build ${{ matrix.model }}'
363+
353364
- name: Run Ledger emulator and execute tests
354365
run: |
355366
set -e

common/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ hex.workspace = true
2828
itertools.workspace = true
2929
lazy_static.workspace = true
3030
merkletree-mintlayer = { workspace = true, features = ["scale-codec"] }
31+
ml_primitives.workspace = true
3132
num.workspace = true
3233
once_cell.workspace = true
3334
parity-scale-codec.workspace = true
@@ -49,7 +50,6 @@ bitcoin-bech32.workspace = true
4950
ctor.workspace = true
5051
expect-test.workspace = true
5152
indoc.workspace = true
52-
ml_primitives.workspace = true
5353
num-traits.workspace = true
5454
proptest.workspace = true
5555
rstest.workspace = true
@@ -59,7 +59,7 @@ trezor-client.workspace = true
5959

6060
[features]
6161
expensive-verification = []
62-
dev = [] # used by fixed-hash
62+
dev = [] # used by fixed-hash
6363

6464
[lints.rust]
6565
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(kani)'] }

common/src/chain/transaction/account_outpoint.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ impl From<&AccountCommand> for AccountType {
6262
}
6363

6464
impl OrderAccountCommand {
65-
pub fn order_id(&self) -> OrderId {
65+
pub fn order_id(&self) -> &OrderId {
6666
match self {
6767
OrderAccountCommand::FillOrder(order_id, _)
6868
| OrderAccountCommand::FreezeOrder(order_id)
69-
| OrderAccountCommand::ConcludeOrder(order_id) => *order_id,
69+
| OrderAccountCommand::ConcludeOrder(order_id) => order_id,
7070
}
7171
}
7272
}
7373

7474
impl From<OrderAccountCommand> for AccountType {
7575
fn from(cmd: OrderAccountCommand) -> Self {
76-
AccountType::Order(cmd.order_id())
76+
AccountType::Order(*cmd.order_id())
7777
}
7878
}
7979

common/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
pub mod address;
1717
pub mod chain;
1818
pub mod primitives;
19+
pub mod primitives_converters;
1920
pub mod size_estimation;
2021
pub mod text_summary;
2122
pub mod time_getter;

0 commit comments

Comments
 (0)