Skip to content

Commit

Permalink
[fix]: Fixing errors introduced by merging in main
Browse files Browse the repository at this point in the history
  • Loading branch information
batconjurer committed Jul 10, 2023
1 parent fdbf3c6 commit 7509919
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions apps/src/lib/node/ledger/shell/init_chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ where
fn initialize_established_accounts(
&mut self,
faucet_pow_difficulty: Option<testnet_pow::Difficulty>,
faucet_withdrawal_limit: Option<token::Amount>,
faucet_withdrawal_limit: Option<namada::types::uint::Uint>,
accounts: Vec<genesis::EstablishedAccount>,
implicit_vp_code_path: &str,
) -> Result<()> {
Expand Down Expand Up @@ -312,7 +312,7 @@ where
let difficulty = faucet_pow_difficulty.unwrap_or_default();
// withdrawal limit defaults to 1000 NAM when not set
let withdrawal_limit =
genesis.faucet_withdrawal_limit.unwrap_or_else(|| {
faucet_withdrawal_limit.unwrap_or_else(|| {
token::Amount::native_whole(1_000).into()
});

Expand Down
1 change: 0 additions & 1 deletion core/src/ledger/testnet_pow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::ledger::storage_api::collections::LazyMap;
use crate::types::address::Address;
use crate::types::hash::Hash;
use crate::types::storage::{self, DbKeySeg, Key};
use crate::types::token;
use crate::types::uint::Uint;

/// Initialize faucet's storage. This must be called at genesis if faucet
Expand Down
1 change: 1 addition & 0 deletions core/src/types/uint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::ops::{Add, AddAssign, BitAnd, Div, Mul, Neg, Rem, Sub, SubAssign};

use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
use impl_num_traits::impl_uint_num_traits;
use num_integer::Integer;
use uint::construct_uint;

use crate::types::token;
Expand Down

0 comments on commit 7509919

Please sign in to comment.