remove marketplace as features (#60)

* remove marketplace as features

* remove serialize

Author: vekamo

Cargo.toml

@@ -54,7 +54,3 @@ built = { version = "0.4", features = ["git2"]}
 [dev-dependencies]
 grin_chain = { path = "./chain", version = "4.4.2" }
 grin_store = { path = "./store", version = "4.4.2" }
-
-
-[features]
-marketplace = ["grin_p2p/marketplace", "grin_api/marketplace", "grin_servers/marketplace"]

api/Cargo.toml

@@ -45,6 +45,3 @@ hyper-rustls = "0.20"
 
 [target.'cfg(target_os = "android")'.dependencies]
 hyper-rustls = { version = "0.21", default-features = false, features = ["webpki-tokio"] }
-
-[features]
-marketplace = ["grin_p2p/marketplace"]

api/src/foreign.rs

@@ -31,11 +31,8 @@ use crate::types::{
 	Version,
 };
 use crate::util::RwLock;
-#[cfg(feature = "marketplace")]
 use crate::{Libp2pMessages, Libp2pPeers};
-#[cfg(feature = "marketplace")]
 use chrono::Utc;
-#[cfg(feature = "marketplace")]
 use grin_p2p::libp2p_connection;
 use std::sync::Weak;
 
@@ -373,7 +370,6 @@ where
 		}
 	}
 
-	#[cfg(feature = "marketplace")]
 	/// Get TOR address on this node. Return none if TOR is not running.
 	pub fn get_libp2p_peers(&self) -> Result<Libp2pPeers, Error> {
 		//get_server_onion_address()
@@ -399,7 +395,7 @@ where
 			node_peers,
 		})
 	}
-	#[cfg(feature = "marketplace")]
+
 	pub fn get_libp2p_messages(&self) -> Result<Libp2pMessages, Error> {
 		Ok(Libp2pMessages {
 			current_time: Utc::now().timestamp(),

api/src/foreign_rpc.rs

@@ -25,9 +25,8 @@ use crate::types::{
 	BlockHeaderPrintable, BlockPrintable, LocatedTxKernel, OutputListing, OutputPrintable, Tip,
 	Version,
 };
-use crate::util;
-#[cfg(feature = "marketplace")]
-use crate::{Libp2pMessages, Libp2pPeers};
+
+use crate::{util, Libp2pMessages, Libp2pPeers};
 
 /// Public definition used to generate Node jsonrpc api.
 /// * When running `grin` with defaults, the V2 api is available at
@@ -863,7 +862,7 @@ pub trait ForeignRpc: Sync + Send {
 	```
 	 */
 	fn push_transaction(&self, tx: Transaction, fluff: Option<bool>) -> Result<(), ErrorKind>;
-	/*
+
 	/**
 	Networked version of [Owner::get_libp2p_peers](struct.Owner.html#method.get_libp2p_peers).
 
@@ -895,17 +894,14 @@ pub trait ForeignRpc: Sync + Send {
 	# );
 	```
 	 */
-	#[cfg(feature = "marketplace")]
 	fn get_libp2p_peers(&self) -> Result<Libp2pPeers, ErrorKind>;
 
-
 	/**
 		Networked version of [Owner::get_libp2p_messages](struct.Owner.html#method.get_libp2p_messages).
 
 		// No example because if current time dynamic nature.
 	*/
 	fn get_libp2p_messages(&self) -> Result<Libp2pMessages, ErrorKind>;
-	*/
 }
 
 impl<B, P, V> ForeignRpc for Foreign<B, P, V>
@@ -1032,16 +1028,12 @@ where
 	fn push_transaction(&self, tx: Transaction, fluff: Option<bool>) -> Result<(), ErrorKind> {
 		Foreign::push_transaction(self, tx, fluff).map_err(|e| e.kind().clone())
 	}
-	/*
-	#[cfg(feature = "marketplace")]
 	fn get_libp2p_peers(&self) -> Result<Libp2pPeers, ErrorKind> {
 		Foreign::get_libp2p_peers(self).map_err(|e| e.kind().clone())
 	}
-	#[cfg(feature = "marketplace")]
 	fn get_libp2p_messages(&self) -> Result<Libp2pMessages, ErrorKind> {
 		Foreign::get_libp2p_messages(self).map_err(|e| e.kind().clone())
 	}
-	*/
 }
 
 #[doc(hidden)]

api/src/types.rs

@@ -20,7 +20,6 @@ use crate::core::{core, ser};
 use crate::p2p;
 use crate::util::secp::pedersen;
 use crate::util::{self, ToHex};
-#[cfg(feature = "marketplace")]
 use grin_p2p::libp2p_connection;
 use serde;
 use serde::de::MapAccess;
@@ -774,7 +773,7 @@ pub struct Libp2pPeers {
 	/// Other nodes. There is a high chance that they are running libp2p network
 	pub node_peers: Vec<String>,
 }
-#[cfg(feature = "marketplace")]
+
 /// Libp2p message from this node
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Libp2pMessages {

p2p/Cargo.toml

@@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
 futures = "0.3"
 #libp2p-tokio-socks5 = { path = "../../rust-libp2p-tokio-socks5" }
 #libp2p = { path = "../../rust-libp2p", default-features = false, features = [ "noise", "yamux", "mplex", "dns", "tcp-tokio", "ping", "gossipsub"] }
-libp2p-tokio-socks5 = { git = "https://github.com/mwcproject/rust-libp2p-tokio-socks5", branch = "master", optional = true}
-libp2p = { git = "https://github.com/mwcproject/rust-libp2p", branch = "master", default-features = false, features = [ "noise", "yamux", "mplex", "dns", "tcp-tokio", "ping", "gossipsub"], optional = true}
+libp2p-tokio-socks5 = { git = "https://github.com/mwcproject/rust-libp2p-tokio-socks5", branch = "master"}
+libp2p = { git = "https://github.com/mwcproject/rust-libp2p", branch = "master", default-features = false, features = [ "noise", "yamux", "mplex", "dns", "tcp-tokio", "ping", "gossipsub"]}
 lazy_static = "1"
 async-std = "1.9"
 tokio = {version = "0.2", features = ["full"] }
@@ -42,8 +42,4 @@ grin_util = { path = "../util", version = "4.4.2" }
 grin_chain = { path = "../chain", version = "4.4.2" }
 
 [dev-dependencies]
-grin_pool = { path = "../pool", version = "4.4.2" }
-
-
-[features]
-marketplace = ["libp2p-tokio-socks5", "libp2p"]
+grin_pool = { path = "../pool", version = "4.4.2" }

p2p/src/lib.rs

@@ -41,7 +41,6 @@ extern crate lazy_static;
 
 mod conn;
 pub mod handshake;
-#[cfg(feature = "marketplace")]
 pub mod libp2p_connection;
 pub mod msg;
 mod peer;
@@ -61,7 +60,6 @@ pub use crate::types::{
 	Seeding, TxHashSetRead, MAX_BLOCK_HEADERS, MAX_LOCATORS, MAX_PEER_ADDRS,
 };
 
-#[cfg(feature = "marketplace")]
 pub use crate::libp2p_connection::{
 	add_new_peer, build_integrity_message, get_libp2p_connections, read_message_data,
 	run_libp2p_node, set_seed_list,

servers/Cargo.toml

@@ -48,6 +48,3 @@ hyper-rustls = "0.20"
 
 [target.'cfg(target_os = "android")'.dependencies]
 hyper-rustls = { version = "0.21", default-features = false, features = ["webpki-tokio"] }
-
-[features]
-marketplace = ["grin_p2p/marketplace", "grin_api/marketplace"]

servers/src/grin/seed.rs

@@ -30,7 +30,6 @@ use std::{cmp, thread, time};
 use crate::core::global;
 use crate::core::global::{FLOONET_DNS_SEEDS, MAINNET_DNS_SEEDS};
 use crate::p2p;
-#[cfg(feature = "marketplace")]
 use crate::p2p::libp2p_connection;
 use crate::p2p::types::PeerAddr;
 use crate::p2p::ChainAdapter;
@@ -65,7 +64,6 @@ pub fn connect_and_monitor(
 				&preferred_peers,
 			);
 
-			#[cfg(feature = "marketplace")]
 			libp2p_connection::set_seed_list(&seed_list, true);
 
 			let mut prev = MIN_DATE.and_hms(0, 0, 0);
@@ -392,7 +390,6 @@ fn listen_for_addrs(
 						Ok(p) => {
 							debug!("Sending peer request to {}", addr);
 							if p.send_peer_request(capab).is_ok() {
-								#[cfg(feature = "marketplace")]
 								match addr {
 									PeerAddr::Onion(_) => {
 										if let Err(_) = libp2p_connection::add_new_peer(&addr) {

servers/src/grin/server.rs

@@ -70,19 +70,12 @@ use grin_util::secp::SecretKey;
 use std::collections::HashSet;
 use std::sync::atomic::Ordering;
 
-#[cfg(feature = "marketplace")]
 use crate::p2p::libp2p_connection;
-#[cfg(feature = "marketplace")]
 use chrono::Utc;
-#[cfg(feature = "marketplace")]
 use grin_core::core::TxKernel;
-#[cfg(feature = "marketplace")]
 use grin_util::from_hex;
-#[cfg(feature = "marketplace")]
 use grin_util::secp::constants::SECRET_KEY_SIZE;
-#[cfg(feature = "marketplace")]
 use grin_util::secp::pedersen::Commitment;
-#[cfg(feature = "marketplace")]
 use std::collections::HashMap;
 
 /// Arcified  thread-safe TransactionPool with type parameters used by server components
@@ -410,7 +403,6 @@ impl Server {
 			socks_port, config.tor_config.tor_enabled
 		);
 
-		#[cfg(feature = "marketplace")]
 		// Initialize libp2p server
 		if config.libp2p_enabled.unwrap_or(true) && onion_address.is_some() && tor_secret.is_some()
 		{