check wildcard pub re-export:

- re-export only "important" items, that is items used in example
- clean JsonrpseeClient API
- didn't touch node-api/src/decoder as taken from parity

compose-macros/src/lib.rs

@@ -23,7 +23,6 @@
 pub use ac_primitives as primitives;
 pub use codec;
 pub use log;
-pub use rpc::*;
 pub use sp_core;
 pub use sp_runtime;
 
@@ -65,7 +64,8 @@ macro_rules! compose_extrinsic_offline {
     $call: expr,
     $params: expr) => {{
 		use $crate::primitives::{
-			ExtrinsicParams, SignExtrinsic, SignedPayload, UncheckedExtrinsicV4,
+			extrinsic_params::{ExtrinsicParams, SignedPayload},
+			SignExtrinsic, UncheckedExtrinsicV4,
 		};
 
 		let extra = $params.signed_extra();

node-api/src/decoder/mod.rs

@@ -24,6 +24,7 @@ type ScaleTypeId = scale_info::interner::UntrackedSymbol<core::any::TypeId>; //
 /// The portable version of [`scale_info::TypeDef`]
 type ScaleTypeDef = scale_info::TypeDef<scale_info::form::PortableForm>;
 
+// short-circuit the "privacy chain" as not pub mod.
 pub use bit_sequence::BitSequenceError;
 pub use decode::{decode_value_as_type, DecodeError};
 pub use encode::{encode_value_as_type, EncodeError};

node-api/src/lib.rs

@@ -20,10 +20,12 @@ extern crate alloc;
 use alloc::{borrow::ToOwned, vec::Vec};
 use codec::{Decode, Encode};
 
-pub use decoder::*;
-pub use events::*;
-pub use metadata::*;
-pub use storage::*;
+//re-export only "important" items: used in examples, ...
+pub use decoder::{
+	decode_as_type, decode_value_as_type, encode_as_type, encode_value_as_type, Primitive, Value,
+};
+pub use events::{EventDetails, Events};
+pub use metadata::{Metadata, MetadataError};
 
 pub mod decoder;
 pub mod error;

node-api/src/metadata.rs

@@ -11,7 +11,7 @@
 //! This file is mostly subxt.
 
 use crate::{alloc::borrow::ToOwned, storage::GetStorageTypes, Encoded};
-use ac_primitives::StorageKey;
+use ac_primitives::serde_impls::StorageKey;
 use codec::{Decode, Encode, Error as CodecError};
 use frame_metadata::{
 	PalletConstantMetadata, RuntimeMetadata, RuntimeMetadataLastVersion, RuntimeMetadataPrefixed,

node-api/src/storage.rs

@@ -14,7 +14,7 @@
 //! For querying runtime storage.
 
 use crate::metadata::MetadataError;
-use ac_primitives::StorageKey;
+use ac_primitives::serde_impls::StorageKey;
 use alloc::{borrow::ToOwned, vec::Vec};
 use codec::Encode;
 use core::marker::PhantomData;

primitives/src/extrinsic_params.rs

@@ -22,8 +22,8 @@ use sp_runtime::{
 	traits::{BlakeTwo256, Hash},
 };
 
-pub type BalanceFor<Runtime> = <Runtime as crate::BalancesConfig>::Balance;
-pub type AssetBalanceFor<Runtime> = <Runtime as crate::AssetsConfig>::Balance;
+pub type BalanceFor<Runtime> = <Runtime as crate::pallet_traits::BalancesConfig>::Balance;
+pub type AssetBalanceFor<Runtime> = <Runtime as crate::pallet_traits::AssetsConfig>::Balance;
 pub type HashFor<Runtime> = <Runtime as crate::FrameSystemConfig>::Hash;
 pub type IndexFor<Runtime> = <Runtime as crate::FrameSystemConfig>::Index;
 

primitives/src/extrinsics.rs

@@ -153,7 +153,10 @@ fn encode_with_vec_prefix<T: Encode, F: Fn(&mut Vec<u8>)>(encoder: F) -> Vec<u8>
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{ExtrinsicParams, GenericAdditionalParams, GenericExtrinsicParams, PlainTip};
+	use crate::{
+		extrinsic_params::{ExtrinsicParams, GenericExtrinsicParams, PlainTip},
+		GenericAdditionalParams,
+	};
 	use sp_core::{Pair, H256 as Hash};
 	use sp_runtime::{generic::Era, testing::sr25519, AccountId32, MultiSignature};
 

primitives/src/lib.rs

@@ -19,14 +19,14 @@
 
 extern crate alloc;
 
-pub use extrinsic_params::*;
-pub use extrinsics::*;
-pub use pallet_traits::*;
-pub use rpc_numbers::*;
+//re-export only "important" items: items used in examples
+pub use extrinsic_params::{
+	AssetTipExtrinsicParams, GenericAdditionalParams, PlainTipExtrinsicParams,
+};
+pub use extrinsics::UncheckedExtrinsicV4;
+pub use pallet_traits::FrameSystemConfig;
 pub use rpc_params::RpcParams;
-pub use serde_impls::*;
-pub use signer::*;
-pub use types::*;
+pub use signer::{ExtrinsicSigner, SignExtrinsic};
 
 pub mod extrinsic_params;
 pub mod extrinsics;

src/api/api_client.rs

@@ -18,7 +18,11 @@ use crate::{
 };
 use ac_compose_macros::rpc_params;
 use ac_node_api::metadata::Metadata;
-use ac_primitives::{Bytes, ExtrinsicParams, FrameSystemConfig, RuntimeVersion, SignExtrinsic};
+use ac_primitives::{
+	extrinsic_params::ExtrinsicParams,
+	serde_impls::{Bytes, RuntimeVersion},
+	FrameSystemConfig, SignExtrinsic,
+};
 use codec::Decode;
 use core::convert::TryFrom;
 use frame_metadata::RuntimeMetadataPrefixed;

src/api/mod.rs

@@ -15,16 +15,21 @@
 
 */
 
-pub use api_client::*;
+//re-export only "important" items: used in examples, ...
+pub use api_client::Api;
 pub use error::{Error, Result};
-pub use rpc_api::*;
+pub use rpc_api::{
+	FetchEvents, GetAccountInformation, GetBalance, GetBlock, GetHeader, GetStorage,
+	GetTransactionPayment, SubmitAndWatch, SubmitAndWatchUntilSuccess, SubmitExtrinsic,
+	SubscribeChain, SubscribeEvents, SystemApi,
+};
 
 pub mod api_client;
 pub mod error;
 pub mod rpc_api;
 
 use ac_node_api::EventDetails;
-use ac_primitives::Bytes;
+use ac_primitives::serde_impls::Bytes;
 use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 

src/api/rpc_api/author.rs

@@ -19,7 +19,7 @@ use crate::{
 	Api, ExtrinsicReport, TransactionStatus, UncheckedExtrinsicV4, XtStatus,
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{Bytes, ExtrinsicParams, FrameSystemConfig};
+use ac_primitives::{extrinsic_params::ExtrinsicParams, serde_impls::Bytes, FrameSystemConfig};
 use codec::Encode;
 use log::*;
 use serde::de::DeserializeOwned;

src/api/rpc_api/chain.rs

@@ -16,7 +16,9 @@ use crate::{
 	rpc::{Request, Subscribe},
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{ExtrinsicParams, FrameSystemConfig, SignedBlock};
+use ac_primitives::{
+	extrinsic_params::ExtrinsicParams, serde_impls::SignedBlock, FrameSystemConfig,
+};
 use log::*;
 use serde::de::DeserializeOwned;
 use sp_runtime::traits::GetRuntimeBlockType;

src/api/rpc_api/events.rs

@@ -18,7 +18,9 @@ use crate::{
 };
 use ac_compose_macros::rpc_params;
 use ac_node_api::{EventDetails, EventRecord, Events};
-use ac_primitives::{ExtrinsicParams, FrameSystemConfig, StorageChangeSet};
+use ac_primitives::{
+	extrinsic_params::ExtrinsicParams, serde_impls::StorageChangeSet, FrameSystemConfig,
+};
 use alloc::{vec, vec::Vec};
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
@@ -208,9 +210,12 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{rpc::mocks::RpcClientMock, AssetTipExtrinsicParams, StorageData};
+	use crate::{rpc::mocks::RpcClientMock, serde_impls::StorageData, AssetTipExtrinsicParams};
 	use ac_node_api::{metadata::Metadata, test_utils::*};
-	use ac_primitives::{Bytes, FrameSystemConfig, RuntimeVersion, SignedBlock};
+	use ac_primitives::{
+		serde_impls::{Bytes, RuntimeVersion, SignedBlock},
+		FrameSystemConfig,
+	};
 	use codec::{Decode, Encode};
 	use frame_metadata::RuntimeMetadataPrefixed;
 	use kitchensink_runtime::{BalancesCall, Runtime, RuntimeCall, UncheckedExtrinsic};

src/api/rpc_api/frame_system.rs

@@ -18,7 +18,10 @@ use crate::{
 	rpc::Request,
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{AccountInfo, ExtrinsicParams, FrameSystemConfig, StorageKey};
+use ac_primitives::{
+	extrinsic_params::ExtrinsicParams, serde_impls::StorageKey, types::AccountInfo,
+	FrameSystemConfig,
+};
 use alloc::{string::String, vec::Vec};
 use log::*;
 
@@ -110,9 +113,9 @@ where
 	Runtime: FrameSystemConfig,
 	Params: ExtrinsicParams<Runtime::Index, Runtime::Hash>,
 {
-	type ChainType = ac_primitives::ChainType;
-	type Properties = ac_primitives::Properties;
-	type Health = ac_primitives::Health;
+	type ChainType = ac_primitives::types::ChainType;
+	type Properties = ac_primitives::types::Properties;
+	type Health = ac_primitives::types::Health;
 
 	fn get_system_name(&self) -> Result<String> {
 		let res = self.client().request("system_name", rpc_params![])?;

src/api/rpc_api/pallet_balances.rs

@@ -12,10 +12,10 @@
 */
 use crate::{
 	api::{Api, GetStorage, Result},
+	extrinsic_params::ExtrinsicParams,
 	rpc::Request,
-	ExtrinsicParams,
 };
-use ac_primitives::BalancesConfig;
+use ac_primitives::pallet_traits::BalancesConfig;
 
 /// Interface to common calls of the substrate balances pallet.
 pub trait GetBalance {

src/api/rpc_api/pallet_transaction_payment.rs

@@ -12,12 +12,15 @@
 */
 use crate::{
 	api::{Api, Error, Result},
+	extrinsic_params::ExtrinsicParams,
 	rpc::Request,
-	ExtrinsicParams,
 };
 use ac_compose_macros::rpc_params;
 use ac_primitives::{
-	BalancesConfig, Bytes, FeeDetails, InclusionFee, NumberOrHex, RuntimeDispatchInfo,
+	pallet_traits::BalancesConfig,
+	rpc_numbers::NumberOrHex,
+	serde_impls::Bytes,
+	types::{FeeDetails, InclusionFee, RuntimeDispatchInfo},
 };
 use core::str::FromStr;
 

src/api/rpc_api/state.rs

@@ -17,7 +17,9 @@ use crate::{
 };
 use ac_compose_macros::rpc_params;
 use ac_primitives::{
-	ExtrinsicParams, FrameSystemConfig, StorageChangeSet, StorageData, StorageKey,
+	extrinsic_params::ExtrinsicParams,
+	serde_impls::{StorageChangeSet, StorageData, StorageKey},
+	FrameSystemConfig,
 };
 use alloc::{string::String, vec, vec::Vec};
 use codec::{Decode, Encode};

src/extrinsic/balances.rs

@@ -21,7 +21,8 @@
 use crate::{api::Api, rpc::Request};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	BalancesConfig, CallIndex, ExtrinsicParams, SignExtrinsic, UncheckedExtrinsicV4,
+	extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, pallet_traits::BalancesConfig,
+	SignExtrinsic, UncheckedExtrinsicV4,
 };
 use alloc::borrow::ToOwned;
 use codec::{Compact, Encode};

src/extrinsic/contracts.rs

@@ -24,8 +24,8 @@
 use crate::{api::Api, rpc::Request};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	CallIndex, ContractsConfig, ExtrinsicParams, FrameSystemConfig, SignExtrinsic,
-	UncheckedExtrinsicV4,
+	extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, pallet_traits::ContractsConfig,
+	FrameSystemConfig, SignExtrinsic, UncheckedExtrinsicV4,
 };
 use alloc::vec::Vec;
 use codec::{Compact, Encode};

src/extrinsic/offline_extrinsic.rs

@@ -19,7 +19,9 @@
 
 use crate::Api;
 use ac_compose_macros::compose_extrinsic_offline;
-use ac_primitives::{ExtrinsicParams, FrameSystemConfig, SignExtrinsic, UncheckedExtrinsicV4};
+use ac_primitives::{
+	extrinsic_params::ExtrinsicParams, FrameSystemConfig, SignExtrinsic, UncheckedExtrinsicV4,
+};
 use codec::Encode;
 
 impl<Signer, Client, Params, Runtime> Api<Signer, Client, Params, Runtime>

src/extrinsic/staking.rs

@@ -21,8 +21,8 @@
 use crate::{rpc::Request, Api};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	CallIndex, ExtrinsicParams, RewardDestination, SignExtrinsic, StakingConfig,
-	UncheckedExtrinsicV4,
+	extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, pallet_traits::StakingConfig,
+	types::RewardDestination, SignExtrinsic, UncheckedExtrinsicV4,
 };
 use codec::{Compact, Decode, Encode};
 

src/extrinsic/utility.rs

@@ -21,7 +21,8 @@
 use crate::{rpc::Request, Api};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	CallIndex, ExtrinsicParams, FrameSystemConfig, SignExtrinsic, UncheckedExtrinsicV4,
+	extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, FrameSystemConfig, SignExtrinsic,
+	UncheckedExtrinsicV4,
 };
 use alloc::{borrow::ToOwned, vec::Vec};
 use codec::{Decode, Encode};

src/lib.rs

@@ -19,6 +19,8 @@
 
 extern crate alloc;
 
+// Required wildcard re-exporting to make all items available.
+// Should not short-circuit the "privacy chain".
 pub use ac_compose_macros::*;
 pub use ac_node_api::*;
 pub use ac_primitives::*;
@@ -28,7 +30,7 @@ pub mod api;
 pub mod extrinsic;
 pub mod rpc;
 
-use ac_primitives::StorageKey;
+use ac_primitives::serde_impls::StorageKey;
 use sp_core::twox_128;
 
 /// Returns the concacenated 128 bit hash of the given module and specific storage key

src/rpc/mod.rs

@@ -16,23 +16,23 @@
 */
 
 #[cfg(feature = "ws-client")]
-pub use ws_client::*;
+pub use ws_client::WsRpcClient;
 #[cfg(feature = "ws-client")]
 pub mod ws_client;
 
 #[cfg(feature = "tungstenite-client")]
-pub use tungstenite_client::*;
+pub use tungstenite_client::TungsteniteRpcClient;
 #[cfg(feature = "tungstenite-client")]
 pub mod tungstenite_client;
 
 #[cfg(feature = "jsonrpsee-client")]
-pub use jsonrpsee_client::*;
+pub use jsonrpsee_client::JsonrpseeClient;
 #[cfg(feature = "jsonrpsee-client")]
 pub mod jsonrpsee_client;
 
 pub mod error;
 
-pub use error::*;
+pub use error::{Error, Result};
 
 #[cfg(test)]
 pub mod mocks;

src/rpc/tungstenite_client/mod.rs

@@ -15,8 +15,8 @@
 
 */
 
-pub use client::*;
-pub use subscription::*;
+pub use client::TungsteniteRpcClient;
+pub use subscription::TungsteniteSubscriptionWrapper;
 
 pub mod client;
 pub mod subscription;

src/rpc/ws_client/mod.rs

@@ -18,6 +18,8 @@
 use crate::rpc::Error as RpcClientError;
 pub use ac_node_api::{events::EventDetails, StaticEvent};
 pub use client::WsRpcClient;
+pub use subscription::WsSubscriptionWrapper;
+
 use log::*;
 use std::{fmt::Debug, sync::mpsc::Sender as ThreadOut};
 use ws::{CloseCode, Handler, Handshake, Message, Result as WsResult, Sender};