Skip to content

Commit b0fbb78

Browse files
committed
merge upstream/main
Signed-off-by: William Hankins <[email protected]>
2 parents 8e29637 + cc00767 commit b0fbb78

File tree

35 files changed

+486
-357
lines changed

35 files changed

+486
-357
lines changed

.github/workflows/run-tests-on-push-to-main.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,7 @@ jobs:
2424
run: cargo fmt --all -- --check
2525

2626
- name: Run Clippy
27-
run: |
28-
cargo clippy --all-targets --all-features \
29-
--package acropolis_common \
30-
--package acropolis_codec \
31-
--package acropolis_module_accounts_state \
32-
--package acropolis_module_address_state \
33-
--package acropolis_module_assets_state \
34-
--package acropolis_module_block_unpacker \
35-
--package acropolis_module_chain_store \
36-
--package acropolis_module_consensus \
37-
--package acropolis_module_drdd_state \
38-
--package acropolis_module_drep_state \
39-
--package acropolis_module_epochs_state \
40-
--package acropolis_module_genesis_bootstrapper \
41-
--package acropolis_module_governance_state \
42-
--package acropolis_module_historical_accounts_state \
43-
--package acropolis_module_mithril_snapshot_fetcher \
44-
--package acropolis_module_parameters_state \
45-
--package acropolis_module_snapshot_bootstrapper \
46-
--package acropolis_module_spdd_state \
47-
--package acropolis_module_spo_state \
48-
--package acropolis_module_stake_delta_filter \
49-
--package acropolis_module_tx_submitter \
50-
--package acropolis_module_tx_unpacker \
51-
--package acropolis_module_upstream_chain_fetcher \
52-
--package acropolis_module_utxo_state \
53-
--package acropolis_process_tx_submitter_cli
27+
run: cargo clippy --all-targets --all-features
5428

5529
- name: Run Build
5630
run: cargo build --verbose

codec/src/map_parameters.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub fn map_gov_action_id(pallas_action_id: &conway::GovActionId) -> Result<GovAc
155155
};
156156

157157
Ok(GovActionId {
158-
transaction_id: TxHash(*pallas_action_id.transaction_id),
158+
transaction_id: TxHash::from(*pallas_action_id.transaction_id),
159159
action_index: act_idx_u8,
160160
})
161161
}

common/src/byte_array.rs

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)