feat(net): get external IPv4 from libp2p #5407

317787106 · 2023-08-09T04:55:04Z

What does this PR do?

get external IPv4 from llibp2p instead of external url

Why are these changes required?

This PR has been tested by:

Unit Tests
Manual Testing

Follow up

Extra details

codecov-commenter · 2023-08-10T04:33:00Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 83.33333% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 61.25%. Comparing base (1536bc9) to head (3a96fa1).
⚠️ Report is 537 commits behind head on develop.

Files with missing lines	Patch %	Lines
.../src/main/java/org/tron/core/config/args/Args.java	75.00%	0 Missing and 1 partial ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@              Coverage Diff              @@
##             develop    #5407      +/-   ##
=============================================
+ Coverage      61.22%   61.25%   +0.03%     
- Complexity      9319     9326       +7     
=============================================
  Files            842      842              
  Lines          50161    50147      -14     
  Branches        5581     5580       -1     
=============================================
+ Hits           30711    30720       +9     
+ Misses         17040    17021      -19     
+ Partials        2410     2406       -4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

framework/src/test/java/org/tron/common/config/args/ArgsTest.java

common/src/main/java/org/tron/common/parameter/CommonParameter.java

framework/src/main/java/org/tron/core/config/args/Args.java

framework/src/test/java/org/tron/core/ShieldWalletTest.java

halibobo1205 · 2023-08-24T07:47:44Z

framework/src/test/java/org/tron/core/WalletTest.java


  private void buildAssetIssue() {
    AssetIssueContract.Builder builder = AssetIssueContract.newBuilder();
+    builder.setOwnerAddress(ByteString.copyFromUtf8("Address1"));


Please don't add non-relevant tests.

test coverage will get smaller if don't add non-relevant tests.

Please follow the PR submission guidelines.

halibobo1205 · 2023-08-24T07:48:41Z

common/src/main/java/org/tron/core/Constant.java


  public static final String NODE_DISCOVERY_EXTERNAL_IP = "node.discovery.external.ip";
-  public static final String AMAZONAWS_URL = "http://checkip.amazonaws.com";
+  //public static final String AMAZONAWS_URL = "http://checkip.amazonaws.com";


I'd suggest just deleting the useless code.

I will delete it

halibobo1205 · 2023-08-30T06:40:02Z

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

+    method2.invoke(Args.class, config3);
+
+    Assert.assertNotEquals("127.0.0.1", CommonParameter.getInstance().getNodeDiscoveryBindIp());
+    Assert.assertNotEquals("46.168.1.1", CommonParameter.getInstance().getNodeExternalIp());


"46.168.1.1": What kind of node is this IP?

46.168.1.1 is the configed node.discovery.external.ip in Constant.TEST_CONF.
127.0.0.1 s the configed node.discovery.bind.ip in Constant.TEST_CONF.

Then it is recommended to get the variables from the Constant.TEST_CONF

I have updated this testcase.

get external ip from libp2p

f86b0e4

317787106 linked an issue Aug 9, 2023 that may be closed by this pull request

Acquire Internet IP from Libp2p API #5368

Closed

317787106 added 2 commits August 9, 2023 17:10

add test case of ArgsTest

a34cbed

feat(test):add testcase of wallet

0db5727

add testcase of Wallet

3f17ec2

317787106 changed the title ~~feat(net): get external ip from libp2p~~ feat(net): get external IPv4 from libp2p Aug 10, 2023

halibobo1205 reviewed Aug 10, 2023

View reviewed changes

framework/src/test/java/org/tron/common/config/args/ArgsTest.java Outdated Show resolved Hide resolved

halibobo1205 added this to the GreatVoyage-v4.7.3 milestone Aug 10, 2023

halibobo1205 assigned 317787106 Aug 10, 2023

halibobo1205 requested review from eodiandie, jwrct, tomatoishealthy and xxo1shine August 11, 2023 07:31

xxo1shine reviewed Aug 14, 2023

View reviewed changes

common/src/main/java/org/tron/common/parameter/CommonParameter.java Outdated Show resolved Hide resolved

jwrct reviewed Aug 14, 2023

View reviewed changes

framework/src/main/java/org/tron/core/config/args/Args.java Outdated Show resolved Hide resolved

317787106 added 2 commits August 15, 2023 15:07

add some test case of wallet

d996d79

add testcase

d1c1074

317787106 commented Aug 17, 2023

View reviewed changes

framework/src/test/java/org/tron/core/ShieldWalletTest.java Outdated Show resolved Hide resolved

317787106 added 6 commits August 17, 2023 18:56

optimize test case

55527b4

remove long text

74c8baa

format code

6c2538b

Merge branch 'develop' into feature/get_ip_once

9051d27

reset some commit, split pr

fa054cd

reset some commit

0230964

halibobo1205 reviewed Aug 24, 2023

View reviewed changes

317787106 added 3 commits August 24, 2023 18:02

feat(net):delete unuseful code

f2bc558

add test case testIpFromLibP2p

fbf2fae

Merge branch 'develop' into feature/get_ip_once

df33f03

rollback test case of WalletTest

e85b3ae

jwrct approved these changes Aug 30, 2023

View reviewed changes

halibobo1205 reviewed Aug 30, 2023

View reviewed changes

test(net): update test case ArgsTest

560ba4c

halibobo1205 approved these changes Aug 30, 2023

View reviewed changes

Merge branch 'develop' into feature/get_ip_once

3a96fa1

317787106 merged commit f9c42d6 into tronprotocol:develop Aug 30, 2023

317787106 added the status:delivery test label Oct 20, 2023

feat(net): get external IPv4 from libp2p #5407

feat(net): get external IPv4 from libp2p #5407

Uh oh!

Conversation

317787106 commented Aug 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

317787106 commented Aug 9, 2023 •

edited

Loading

codecov-commenter commented Aug 10, 2023 •

edited

Loading