Skip to content

Commit

Permalink
Don't attempt running tests on the verify-chain binary
Browse files Browse the repository at this point in the history
Adds a minimum XMR fee to the processor and runs fmt.
  • Loading branch information
kayabaNerve committed Jul 7, 2024
1 parent c521bbb commit 1bfd7d9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/monero-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ jobs:
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-simple-request-rpc --test '*'
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --test '*'
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --test '*'
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --test '*'
- name: Run Integration Tests
# Don't run if the the tests workflow also will
Expand All @@ -76,4 +75,3 @@ jobs:
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-simple-request-rpc --test '*'
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --all-features --test '*'
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --all-features --test '*'
GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --test '*'
9 changes: 1 addition & 8 deletions orchestration/src/coins/monero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,7 @@ CMD ["/run.sh"]
}

pub fn monero(orchestration_path: &Path, network: Network) {
monero_internal(
network,
Os::Debian,
orchestration_path,
"monero",
"monerod",
"18080 18081",
)
monero_internal(network, Os::Debian, orchestration_path, "monero", "monerod", "18080 18081")
}

pub fn monero_wallet_rpc(orchestration_path: &Path) {
Expand Down
4 changes: 2 additions & 2 deletions processor/src/networks/monero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ impl Monero {
fees.sort();
let fee = fees.get(fees.len() / 2).copied().unwrap_or(0);

// TODO: Set a sane minimum fee
Ok(FeeRate::new(fee.max(1500000), 10000).unwrap())
// TODO: Set a sane minimum/maximum fee
Ok(FeeRate::new(fee.min(50_000).max(5_000_000), 10000).unwrap())
}

async fn make_signable_transaction(
Expand Down

0 comments on commit 1bfd7d9

Please sign in to comment.