Skip to content

Commit

Permalink
Merge branch 'main' into james/ethbridge/update-with-main-2022-09-26
Browse files Browse the repository at this point in the history
* main:
  Revert "Update getting-started.md"
  Update getting-started.md
  changelog: add #442
  rustdoc: fix outdated links
  make build-doc: only build rustdoc in this command

# Conflicts:
#	apps/src/lib/node/ledger/shell/mod.rs
#	apps/src/lib/node/ledger/shell/prepare_proposal.rs
  • Loading branch information
james-chf committed Sep 26, 2022
2 parents 216efc9 + fda71af commit 156f829
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .changelog/unreleased/bug-fixes/419-fix-rustdoc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix the rustdoc build. ([#419](https://github.com/anoma/namada/issues/419))
5 changes: 3 additions & 2 deletions apps/src/lib/node/ledger/shell/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
//!
//! Any changes applied before [`Shell::finalize_block`] might have to be
//! reverted, so any changes applied in the methods [`Shell::prepare_proposal`]
//! must be also reverted (unless we can simply overwrite them in the next
//! block). More info in <https://github.com/anoma/anoma/issues/362>.
//! and [`Shell::process_proposal`] must be also reverted
//! (unless we can simply overwrite them in the next block).
//! More info in <https://github.com/anoma/anoma/issues/362>.
mod finalize_block;
mod init_chain;
mod prepare_proposal;
Expand Down
2 changes: 1 addition & 1 deletion apps/src/lib/node/ledger/shell/prepare_proposal.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Implementation of the `PrepareProposal` ABCI++ method for the Shell
//! Implementation of the [`RequestPrepareProposal`] ABCI++ method for the Shell
use namada::ledger::storage::{DBIter, StorageHasher, DB};
use namada::proto::Tx;
Expand Down

0 comments on commit 156f829

Please sign in to comment.