Skip to content

Commit

Permalink
Note: MWC keeping V2 API because backward combability. But to make it…
Browse files Browse the repository at this point in the history
… independent we kept copies of the test functions. That will allow to rebase easier

Remove V2 Owner API (mimblewimble#351)
* remove v2 owner API
* rename former owner_rpc_s to owner_rpc
* remove use_token arg from doc tests

(cherry picked from commit 62e3aed)

# Conflicts:
#	api/src/owner_rpc.rs
#	api/src/owner_rpc_s.rs
#	controller/src/controller.rs
#	tests/owner_v2_sanity.rs
  • Loading branch information
yeastplume authored and bayk committed Dec 4, 2020
1 parent 514800d commit e30c579
Show file tree
Hide file tree
Showing 5 changed files with 3,433 additions and 3,128 deletions.
5 changes: 3 additions & 2 deletions api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,20 @@ mod foreign_rpc;

mod owner;
mod owner_rpc;
mod owner_rpc_s;
mod owner_rpc_v2;

mod types;

pub use crate::foreign::{Foreign, ForeignCheckMiddleware, ForeignCheckMiddlewareFn};
pub use crate::foreign_rpc::ForeignRpc;
pub use crate::owner::Owner;
pub use crate::owner_rpc::OwnerRpc;
pub use crate::owner_rpc_s::OwnerRpcS;
pub use crate::owner_rpc_v2::OwnerRpcV2;

pub use crate::foreign_rpc::foreign_rpc as foreign_rpc_client;
pub use crate::foreign_rpc::run_doctest_foreign;
pub use crate::owner_rpc::run_doctest_owner;
pub use crate::owner_rpc_v2::run_doctest_owner_v2;

pub use types::{
ECDHPubkey, EncryptedRequest, EncryptedResponse, EncryptionErrorResponse, JsonId, PubAddress,
Expand Down
Loading

0 comments on commit e30c579

Please sign in to comment.