Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix base_node_service_config not read #3251

Merged
merged 2 commits into from
Aug 27, 2021
Merged

fix: fix base_node_service_config not read #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b54e424
Fix base_node_service_config not read
hansieodendaal Aug 26, 2021
0434e9e
Merge branch 'development' into ho_base_node_service_config
aviator-app[bot] Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion applications/tari_base_node/src/bootstrap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ where B: BlockchainBackend + 'static
pubsub_connector(runtime::Handle::current(), buf_size, config.buffer_rate_limit_base_node);
let peer_message_subscriptions = Arc::new(peer_message_subscriptions);

let node_config = BaseNodeServiceConfig::default(); // TODO - make this configurable
let node_config = BaseNodeServiceConfig {
service_request_timeout: config.service_request_timeout,
fetch_blocks_timeout: config.fetch_blocks_timeout,
fetch_utxos_timeout: config.fetch_utxos_timeout,
..Default::default()
};
let mempool_config = MempoolServiceConfig::default(); // TODO - make this configurable

let comms_config = self.create_comms_config();
Expand Down
3 changes: 1 addition & 2 deletions applications/tari_console_wallet/src/init/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ pub async fn init_wallet(
peer_database_name: "peers".to_string(),
max_concurrent_inbound_tasks: 100,
outbound_buffer_size: 100,
// TODO - make this configurable
dht: DhtConfig {
database_url: DbConnectionUrl::File(config.data_dir.join("dht-console-wallet.db")),
auto_join: true,
Expand All @@ -335,7 +334,7 @@ pub async fn init_wallet(
dedup_cache_capacity: config.dedup_cache_capacity,
..Default::default()
},
// TODO: This should be false unless testing locally - make this configurable
// This should be false unless testing locally
allow_test_addresses: config.allow_test_addresses,
listener_liveness_allowlist_cidrs: Vec::new(),
listener_liveness_max_sessions: 0,
Expand Down