Skip to content

Commit f86d7d7

Browse files
authored
Merge branch 'feat/cardano-blockchain-types' into fix/rust-test-doc
2 parents 582e60e + c80fa33 commit f86d7d7

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.github/workflows/ci.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,9 @@ jobs:
1515
ci:
1616
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.1.0
1717
with:
18-
forge_version: 0.2.0
18+
forge_version: 0.2.0
19+
20+
test_reporting:
21+
if: always()
22+
needs: ci
23+
uses: ./.github/workflows/generate-allure-report.yml

.github/workflows/generate-allure-report.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: Allure Report Generation
22

33
on:
4-
pull_request:
5-
push:
6-
branches: [main]
4+
workflow_call:
75

86
permissions:
97
contents: write

rust/cardano-blockchain-types/src/fork.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
use crate::conversion::from_saturating;
1010

11-
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
11+
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd)]
1212
/// Counter that is incremented every time there is a roll-back in live-chain
1313
pub struct Fork(u64);
1414

rust/cardano-blockchain-types/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ pub use auxdata::{
1919
metadatum_value::MetadatumValue,
2020
scripts::{Script, ScriptArray, ScriptType, TransactionScripts},
2121
};
22+
pub use fork::Fork;
2223
pub use multi_era_block_data::MultiEraBlock;
24+
pub use network::Network;
2325
pub use point::Point;
2426
pub use slot::Slot;
2527
pub use txn_index::TxnIndex;

0 commit comments

Comments
 (0)