Commit 1292373
committed
fix(config): address PR review feedback on bean binding
- StorageConfig: restore try-catch around parseInt/parseLong in
readDbOption() to preserve friendly error messages with field name,
expected type, and actual value (matches develop Storage.setIfNeeded).
- NodeConfig: align JsonRpcConfig.maxBlockFilterNum default (0 -> 50000)
with reference.conf and develop CommonParameter default.
- reference.conf: change DNS maxMergeSize (5 -> 0) and changeThreshold
(0.1 -> 0.0) so behavior matches develop when users omit these keys
(develop uses hasPath guard, leaving PublishConfig defaults of 0).
- CommitteeConfig: remove redundant alias block + public setters for
allowPBFT/pBFTExpireNum. Public setters caused ConfigBeanFactory to
derive uppercase property names that don't match config keys, which
previously required the alias workaround. Keep only getters + direct
field assignment in fromConfig().1 parent 62a3236 commit 1292373
4 files changed
Lines changed: 45 additions & 24 deletions
File tree
- common/src/main
- java/org/tron/core/config/args
- resources
Lines changed: 6 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
54 | 59 | | |
55 | | - | |
56 | 60 | | |
57 | | - | |
58 | 61 | | |
59 | 62 | | |
60 | 63 | | |
| |||
99 | 102 | | |
100 | 103 | | |
101 | 104 | | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
| 105 | + | |
111 | 106 | | |
112 | 107 | | |
113 | 108 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
300 | 300 | | |
301 | 301 | | |
302 | 302 | | |
303 | | - | |
| 303 | + | |
304 | 304 | | |
305 | 305 | | |
306 | 306 | | |
| |||
Lines changed: 36 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
233 | | - | |
234 | | - | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
235 | 239 | | |
236 | 240 | | |
237 | | - | |
238 | | - | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
239 | 247 | | |
240 | 248 | | |
241 | | - | |
242 | | - | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
243 | 255 | | |
244 | 256 | | |
245 | | - | |
246 | | - | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
247 | 263 | | |
248 | 264 | | |
249 | | - | |
250 | | - | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
251 | 271 | | |
252 | 272 | | |
253 | 273 | | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
254 | 280 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
369 | 369 | | |
370 | 370 | | |
371 | 371 | | |
372 | | - | |
373 | | - | |
| 372 | + | |
| 373 | + | |
374 | 374 | | |
375 | 375 | | |
376 | 376 | | |
| |||
0 commit comments