Skip to content

Commit 8b22ba3

Browse files
committed
Remove unused tiles.bundle.request_timeout config
(for now)
1 parent 478ddbc commit 8b22ba3

File tree

8 files changed

+2
-23
lines changed

8 files changed

+2
-23
lines changed

src/app/fdctl/config/default.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,12 +1162,6 @@ dynamic_port_range = "8900-9000"
11621162
# [3e3,3600e3]
11631163
keepalive_interval_millis = 5000
11641164

1165-
# Consider a connection failed if the bundle server fails to
1166-
# respond to a request in the given time frame. The validator
1167-
# will reconnect eventually, but with increasing delays if there
1168-
# are repeated failures. Must be within range [500,60000].
1169-
request_timeout_millis = 3000
1170-
11711165
# The pack tile takes incoming transactions that have been verified
11721166
# by the verify tile and then deduplicated, and attempts to order
11731167
# them in an optimal way to generate the most fees per compute

src/app/fdctl/topology.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ fd_topo_initialize( config_t * config ) {
386386
strncpy( tile->bundle.key_log_path, config->development.bundle.ssl_key_log_file, sizeof(tile->bundle.key_log_path) );
387387
tile->bundle.buf_sz = config->development.bundle.buffer_size_kib<<10;
388388
tile->bundle.ssl_heap_sz = config->development.bundle.ssl_heap_size_mib<<20;
389-
tile->bundle.keepalive_interval_nanos = (ulong)( (float)config->tiles.bundle.keepalive_interval_millis * 1e6f );
390-
tile->bundle.request_timeout_nanos = (ulong)( (float)config->tiles.bundle.request_timeout_millis * 1e6f );
389+
tile->bundle.keepalive_interval_nanos = config->tiles.bundle.keepalive_interval_millis * (ulong)1e6;
391390
} else if( FD_UNLIKELY( !strcmp( tile->name, "verify" ) ) ) {
392391
tile->verify.tcache_depth = config->tiles.verify.signature_cache_size;
393392

src/app/firedancer/config/default.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -867,12 +867,6 @@ user = ""
867867
# [3e3,3600e3]
868868
keepalive_interval_millis = 5000
869869

870-
# Consider a connection failed if the bundle server fails to
871-
# respond to a request in the given time frame. The validator
872-
# will reconnect eventually, but with increasing delays if there
873-
# are repeated failures. Must be within range [500,60000].
874-
request_timeout_millis = 3000
875-
876870
# The pack tile takes incoming transactions that have been verified
877871
# by the verify tile and then deduplicated, and attempts to order
878872
# them in an optimal way to generate the most fees per compute

src/app/shared/fd_config.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,10 +527,6 @@ fd_config_validate( fd_config_t const * config ) {
527527
config->tiles.bundle.keepalive_interval_millis > 3600000 ) ) {
528528
FD_LOG_ERR(( "`tiles.bundle.keepalive_interval_millis` must be in range [3000, 3,600,000]" ));
529529
}
530-
if( FD_UNLIKELY( config->tiles.bundle.request_timeout_millis < 500 &&
531-
config->tiles.bundle.request_timeout_millis > 60000 ) ) {
532-
FD_LOG_ERR(( "`tiles.bundle.request_timeout_millis` must be in range [500, 60,000]" ));
533-
}
534530

535531
CFG_HAS_NON_EMPTY( development.netns.interface0 );
536532
CFG_HAS_NON_EMPTY( development.netns.interface0_mac );

src/app/shared/fd_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ struct fd_config {
336336
char tip_distribution_authority[ FD_BASE58_ENCODED_32_SZ ];
337337
uint commission_bps;
338338
ulong keepalive_interval_millis;
339-
ulong request_timeout_millis;
340339
} bundle;
341340

342341
struct {

src/app/shared/fd_config_parse.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ fd_config_extract_pod( uchar * pod,
189189
CFG_POP ( cstr, tiles.bundle.tip_distribution_authority );
190190
CFG_POP ( uint, tiles.bundle.commission_bps );
191191
CFG_POP ( ulong, tiles.bundle.keepalive_interval_millis );
192-
CFG_POP ( ulong, tiles.bundle.request_timeout_millis );
193192

194193
CFG_POP ( uint, tiles.pack.max_pending_transactions );
195194
CFG_POP ( bool, tiles.pack.use_consumed_cus );

src/app/shared_dev/commands/bundle_client.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ bundle_client_topo( config_t * config ) {
5252
strncpy( bundle_tile->bundle.key_log_path, config->development.bundle.ssl_key_log_file, sizeof(bundle_tile->bundle.key_log_path) );
5353
bundle_tile->bundle.buf_sz = config->development.bundle.buffer_size_kib<<10;
5454
bundle_tile->bundle.ssl_heap_sz = config->development.bundle.ssl_heap_size_mib<<20;
55-
bundle_tile->bundle.keepalive_interval_nanos = (ulong)( (float)config->tiles.bundle.keepalive_interval_millis * 1e6f );
56-
bundle_tile->bundle.request_timeout_nanos = (ulong)( (float)config->tiles.bundle.request_timeout_millis * 1e6f );
55+
bundle_tile->bundle.keepalive_interval_nanos = config->tiles.bundle.keepalive_interval_millis * (ulong)1e6;
5756

5857
strncpy( sign_tile->sign.identity_key_path, config->paths.identity_key, sizeof(sign_tile->sign.identity_key_path) );
5958

src/disco/topo/fd_topo.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ typedef struct {
200200
ulong buf_sz;
201201
ulong ssl_heap_sz;
202202
ulong keepalive_interval_nanos;
203-
ulong request_timeout_nanos;
204203
} bundle;
205204

206205
struct {

0 commit comments

Comments
 (0)