Skip to content

Commit 12e101e

Browse files
author
Bo Wu
committed
add workflow and fix formatting issue
1 parent a62518c commit 12e101e

File tree

13 files changed

+64
-91
lines changed

13 files changed

+64
-91
lines changed

.github/actions.bak/file-change-determinator/action.yaml renamed to .github/actions/file-change-determinator/action.yaml

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ on:
44
types: [labeled, opened, synchronize, reopened, auto_merge_enabled]
55
push:
66
branches:
7-
- main
8-
- devnet
9-
- testnet
10-
- mainnet
11-
- aptos-node-v*
12-
- aptos-release-v*
7+
- l1-migration
138
workflow_dispatch:
149

1510
env:

.github/workflows/pull-request-validation.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,18 @@ jobs:
207207
echo "✅ Docker image built and pushed successfully!"
208208
echo "📦 Image: ghcr.io/movementlabsxyz/aptos-node:${{ env.GIT_SHA_SHORT }}"
209209
echo "🏷️ Tag: ${{ env.GIT_SHA_SHORT }}"
210-
echo "🌐 Registry: ghcr.io/movementlabsxyz/aptos-node"
210+
echo "🌐 Registry: ghcr.io/movementlabsxyz/aptos-node"
211+
212+
rust-lints:
213+
runs-on: ubuntu-latest
214+
steps:
215+
- uses: actions/checkout@v4
216+
- uses: ./.github/actions/rust-lints
217+
218+
rust-unit-tests:
219+
runs-on: ubuntu-latest
220+
steps:
221+
- uses: actions/checkout@v4
222+
- uses: ./.github/actions/rust-unit-tests
223+
with:
224+
TRUNK_API_TOKEN: ${{ secrets.TRUNK_API_TOKEN }}

aptos-move/aptos-release-builder/src/simulate.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -477,13 +477,9 @@ pub async fn simulate_multistep_proposal(
477477
let txn = account
478478
.account()
479479
.transaction()
480-
.script(Script::new(
481-
script_blob,
482-
vec![],
483-
vec![
484-
TransactionArgument::U64(DUMMY_PROPOSAL_ID), // dummy proposal id, ignored by the patched function
485-
],
486-
))
480+
.script(Script::new(script_blob, vec![], vec![
481+
TransactionArgument::U64(DUMMY_PROPOSAL_ID), // dummy proposal id, ignored by the patched function
482+
]))
487483
.chain_id(chain_id.chain_id())
488484
.sequence_number(script_idx as u64)
489485
.gas_unit_price(gas_params.vm.txn.min_price_per_gas_unit.into())

consensus/consensus-types/src/quorum_cert.rs

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,15 @@ impl QuorumCert {
9898
ledger_info.epoch()
9999
};
100100

101-
let ancestor = if ledger_info.ends_epoch() {
102-
BlockInfo::new(
103-
ancestor_epoch,
104-
0,
105-
genesis_id,
106-
ledger_info.transaction_accumulator_hash(),
107-
ledger_info.version(),
108-
ledger_info.timestamp_usecs(),
109-
None,
110-
)
111-
} else {
112-
BlockInfo::new(
113-
ancestor_epoch,
114-
0,
115-
genesis_id,
116-
ledger_info.transaction_accumulator_hash(),
117-
ledger_info.version(),
118-
ledger_info.timestamp_usecs(),
119-
None,
120-
)
121-
};
122-
101+
let ancestor = BlockInfo::new(
102+
ancestor_epoch,
103+
0,
104+
genesis_id,
105+
ledger_info.transaction_accumulator_hash(),
106+
ledger_info.version(),
107+
ledger_info.timestamp_usecs(),
108+
None,
109+
);
123110
let vote_data = VoteData::new(ancestor.clone(), ancestor.clone());
124111
let li = LedgerInfo::new(ancestor, vote_data.hash());
125112

crates/aptos/src/common/init.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -436,17 +436,13 @@ pub enum Network {
436436

437437
impl Display for Network {
438438
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
439-
write!(
440-
f,
441-
"{}",
442-
match self {
443-
Network::Mainnet => "mainnet",
444-
Network::Testnet => "testnet",
445-
Network::Devnet => "devnet",
446-
Network::Local => "local",
447-
Network::Custom => "custom",
448-
}
449-
)
439+
write!(f, "{}", match self {
440+
Network::Mainnet => "mainnet",
441+
Network::Testnet => "testnet",
442+
Network::Devnet => "devnet",
443+
Network::Local => "local",
444+
Network::Custom => "custom",
445+
})
450446
}
451447
}
452448

0 commit comments

Comments
 (0)