Move proof to be a sub-module of merkle

[richardpringle]

Proofs only make sense in the context of a merkle-tree, therefore they should be a submodule of the merkle module.

[rkuris]

The API returns proofs, so we want api::Proof to be visible to callers. Otherwise, the whole merkle module has to be pub.

[richardpringle]

The API returns proofs, so we want api::Proof to be visible to callers. Otherwise, the whole merkle module has to be pub.

I thought the api module was just a mechanism for serving two apis at the same time. We shouldn't have a separate module for the public API, there's a reason that no one does this.

Otherwise, the whole merkle module has to be pub.

This specifically is incorrect. The whole purpose of pub use merkle::Proof (called in the db.rs) solves this problem. The Proof type and the impl Proof should live in the same place.

[rkuris]

The API returns proofs, so we want api::Proof to be visible to callers. Otherwise, the whole merkle module has to be pub.

I thought the api module was just a mechanism for serving two apis at the same time. We shouldn't have a separate module for the public API, there's a reason that no one does this.

Otherwise, the whole merkle module has to be pub.

This specifically is incorrect. The whole purpose of pub use merkle::Proof (called in the db.rs) solves this problem. The Proof type and the impl Proof should live in the same place.

This only works if merkle::Proof is also pub, which is what I want to avoid. This does not compile:

pub use inner::Thing;

mod inner {
    struct Thing {}
}

[richardpringle]

The API returns proofs, so we want api::Proof to be visible to callers. Otherwise, the whole merkle module has to be pub.

I thought the api module was just a mechanism for serving two apis at the same time. We shouldn't have a separate module for the public API, there's a reason that no one does this.

Otherwise, the whole merkle module has to be pub.

This specifically is incorrect. The whole purpose of pub use merkle::Proof (called in the db.rs) solves this problem. The Proof type and the impl Proof should live in the same place.

This only works if merkle::Proof is also pub, which is what I want to avoid. This does not compile:

pub use inner::Thing;

mod inner {
    struct Thing {}
}

but this does
https://github.com/ava-labs/firewood/pull/378/files#diff-648f516579918c7c3dddf3fd5eec6807c064b1ae8f8411d2c029bd804f7ef871R4

[rkuris]

This change resolves my concern: https://github.com/ava-labs/firewood/compare/b4f58a50058431fc80d0b8ac5b680573d33ff6b0..25eaca9a4800f6d24b9aa881ae0245dd25c4c49e

Apologies for thinking that this wasn't possible. I didn't realize that if you have a pub inside a private module and have visibility to that, it can be exported in a public module. Thanks for educating me @richardpringle