File tree Expand file tree Collapse file tree
main/java/org/tron/core/config/args Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1335,7 +1335,12 @@ public static PublishConfig loadDnsPublishConfig(final com.typesafe.config.Confi
13351335 if (config .hasPath (Constant .NODE_DNS_PUBLISH )) {
13361336 publishConfig .setDnsPublishEnable (config .getBoolean (Constant .NODE_DNS_PUBLISH ));
13371337 }
1338+ loadDnsPublishParameters (config , publishConfig );
1339+ return publishConfig ;
1340+ }
13381341
1342+ public static void loadDnsPublishParameters (final com .typesafe .config .Config config ,
1343+ PublishConfig publishConfig ) {
13391344 if (publishConfig .isDnsPublishEnable ()) {
13401345 if (config .hasPath (Constant .NODE_DNS_DOMAIN ) && StringUtils .isNotEmpty (
13411346 config .getString (Constant .NODE_DNS_DOMAIN ))) {
@@ -1427,7 +1432,6 @@ public static PublishConfig loadDnsPublishConfig(final com.typesafe.config.Confi
14271432 }
14281433 }
14291434 }
1430- return publishConfig ;
14311435 }
14321436
14331437 private static void logEmptyError (String arg ) {
Original file line number Diff line number Diff line change @@ -79,7 +79,13 @@ public void testEndpointFromNode() {
7979 @ Test
8080 public void testPublishConfig () {
8181 Config config = Configuration .getByFileName (Constant .TEST_CONF , Constant .TEST_CONF );
82- PublishConfig publishConfig = Args .loadDnsPublishConfig (config );
82+
83+ PublishConfig publishConfig = new PublishConfig ();
84+ Assert .assertFalse (publishConfig .isDnsPublishEnable ());
85+
86+ publishConfig .setDnsPublishEnable (true );
87+ Assert .assertTrue (publishConfig .isDnsPublishEnable ());
88+ Args .loadDnsPublishParameters (config , publishConfig );
8389 Assert .assertTrue (publishConfig .isDnsPublishEnable ());
8490 Assert .assertEquals (5 , publishConfig .getMaxMergeSize ());
8591 Assert .assertEquals (DnsType .AwsRoute53 , publishConfig .getDnsType ());
Original file line number Diff line number Diff line change @@ -126,6 +126,8 @@ public class SendCoinShieldTest {
126126 */
127127 @ BeforeClass
128128 public static void init () {
129+ FileUtil .deleteDir (new File (dbPath ));
130+
129131 dbManager = context .getBean (Manager .class );
130132 wallet = context .getBean (Wallet .class );
131133 //init energy
Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ node {
114114 ]
115115
116116 # enable or disable dns publish, default false
117- publish = true
117+ publish = false
118118
119119 # dns domain to publish nodes, required if publish is true
120120 dnsDomain = "nodes1.example.org"
You can’t perform that action at this time.
0 commit comments