Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contracts/compliance/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@ impl ComplianceContract {
}

/// Compute the current [`AddressState`] for a single address without auth.
#[allow(dead_code)]
fn address_state(env: &Env, addr: &Address) -> AddressState {
let blocked: bool = env
.storage()
Expand Down
3 changes: 2 additions & 1 deletion contracts/invoice/tests/invoice_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,10 @@ fn test_cancelled_invoice_cannot_be_marked_paid() {

#[test]
fn test_cancel_invoice_unauthorized_rejected() {
let (env, _admin, client) = setup();
let (env, admin, client) = setup();
let merchant = Address::generate(&env);
let unauthorized = Address::generate(&env);
let payer = Address::generate(&env);
let id = client.create_invoice(
&merchant,
&10_000_000,
Expand Down
2 changes: 1 addition & 1 deletion contracts/treasury/tests/duplicate_approval_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};

fn setup(env: &Env) -> (TreasuryContractClient, Address, u64) {
fn setup(env: &Env) -> (TreasuryContractClient<'_>, Address, u64) {
let admin = Address::generate(env);
let merchant = Address::generate(env);
let contract_id = env.register_contract(None, TreasuryContract);
Expand Down
2 changes: 1 addition & 1 deletion contracts/treasury/tests/partial_settlement_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};

fn setup(env: &Env, total: i128) -> (TreasuryContractClient, Address, Address, u64) {
fn setup(env: &Env, total: i128) -> (TreasuryContractClient<'_>, Address, Address, u64) {
let admin = Address::generate(env);
let merchant = Address::generate(env);
let contract_id = env.register_contract(None, TreasuryContract);
Expand Down
2 changes: 1 addition & 1 deletion contracts/treasury/tests/settlement_pagination_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
// is a read-only scan, so this is a generous ceiling, not a tight one.
const PAGE_INSTRUCTION_BUDGET: u64 = 100_000_000;

fn setup_with_settlements(env: &Env, n: u64) -> (TreasuryContractClient, Address) {
fn setup_with_settlements(env: &Env, n: u64) -> (TreasuryContractClient<'_>, Address) {
let admin = Address::generate(env);
let contract_id = env.register_contract(None, TreasuryContract);
let client = TreasuryContractClient::new(env, &contract_id);
Expand Down
4 changes: 2 additions & 2 deletions contracts/treasury/tests/task1_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use soroban_sdk::{
testutils::{Address as _, Events},
Address, Env, FromVal, Symbol,
};
use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};
use treasury::{TreasuryContract, TreasuryContractClient};

fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address) {
fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address) {
env.mock_all_auths();
let admin = Address::generate(env);
let id = env.register_contract(None, TreasuryContract);
Expand Down
2 changes: 1 addition & 1 deletion contracts/treasury/tests/threshold_update_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{TreasuryContract, TreasuryContractClient};

fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address) {
fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address) {
let admin = Address::generate(env);
let contract_id = env.register_contract(None, TreasuryContract);
let client = TreasuryContractClient::new(env, &contract_id);
Expand Down
2 changes: 1 addition & 1 deletion contracts/treasury/tests/treasury_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};

fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address) {
fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address) {
env.mock_all_auths();
let admin = Address::generate(env);
let id = env.register_contract(None, TreasuryContract);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{SettlementStatus, TreasuryContract, TreasuryContractClient};

fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address, Address) {
fn setup(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address, Address) {
let admin = Address::generate(env);
let merchant = Address::generate(env);
let contract_id = env.register_contract(None, TreasuryContract);
Expand Down
2 changes: 1 addition & 1 deletion contracts/treasury/tests/unauthorized_signer_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{TreasuryContract, TreasuryContractClient};

fn setup_treasury(env: &Env, threshold: u32) -> (TreasuryContractClient, Address, Address) {
fn setup_treasury(env: &Env, threshold: u32) -> (TreasuryContractClient<'_>, Address, Address) {
env.mock_all_auths();
let admin = Address::generate(env);
let contract_id = env.register_contract(None, TreasuryContract);
Expand Down
6 changes: 3 additions & 3 deletions tests/tests/invoice_treasury_integration_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use invoice::{
InvoiceContract, InvoiceContractClient, InvoiceError, InvoiceStatus, MaybeAddress, MaybeBytes,
InvoiceContract, InvoiceContractClient, InvoiceStatus, MaybeAddress, MaybeBytes,
};
use soroban_sdk::{contract, contractimpl, testutils::Address as _, Address, Env};
use soroban_sdk::{testutils::Address as _, Address, Env};
use treasury::{TreasuryContract, TreasuryContractClient};

mod test_token {
Expand Down Expand Up @@ -79,7 +79,7 @@ fn setup() -> (

#[test]
fn invoice_created_paid_released() {
let (env, admin, merchant, payer, invoice, _treasury_id, _treasury, _token_id) = setup();
let (_env, admin, merchant, payer, invoice, _treasury_id, _treasury, _token_id) = setup();

let id = invoice.create_invoice(
&merchant,
Expand Down
Loading