Skip to content

Update ropsten to goerli network and add celeste network #6

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

Merged
merged 1 commit into from
Nov 21, 2022
Merged

Update ropsten to goerli network and add celeste network #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/org/torusresearch/fetchnodedetails/FetchNodeDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,19 @@
public class FetchNodeDetails {

public static String PROXY_ADDRESS_MAINNET = "0xf20336e16B5182637f09821c27BDe29b0AFcfe80";
public static String PROXY_ADDRESS_TESTNET = "0x6258c9d6c12ed3edda59a1a6527e469517744aa7";
public static String PROXY_ADDRESS_TESTNET = "0xd084604e5FA387FbC2Da8bAab07fDD6aDED4614A";
public static String PROXY_ADDRESS_CYAN = "0x9f072ba19b3370e512aa1b4bfcdaf97283168005";
public static String PROXY_ADDRESS_AQUA = "0x29Dea82a0509153b91040ee13cDBba0f03efb625";
public static String PROXY_ADDRESS_CELESTE = "0x6Bffb4e89453069E7487f0fa5c9f4a2D771cce6c";


public static HashMap<TorusNetwork, String> NETWORK_MAP = new HashMap<TorusNetwork, String>() {
{
put(TorusNetwork.MAINNET, "mainnet");
put(TorusNetwork.TESTNET, "ropsten");
put(TorusNetwork.TESTNET, "goerli");
put(TorusNetwork.CYAN, "polygon-mainnet");
put(TorusNetwork.AQUA, "polygon-mainnet");
put(TorusNetwork.CELESTE, "polygon-mainnet");
}
};

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/torusresearch/fetchnodedetails/types/TorusNetwork.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ public enum TorusNetwork {
MAINNET("mainnet"),
TESTNET("testnet"),
CYAN("cyan"),
AQUA("aqua");
AQUA("aqua"),
CELESTE("celeste");


private final String val;
Expand Down
9 changes: 8 additions & 1 deletion src/test/java/org/torusresearch/fetchnodedetailstest/FetchNodeDetailsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,15 @@ public void shouldGetNodeDetailsCyan() throws ExecutionException, InterruptedExc
@Test
public void shouldGetNodeDetailsAqua() throws ExecutionException, InterruptedException, UnsupportedEncodingException {
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.AQUA, FetchNodeDetails.PROXY_ADDRESS_AQUA);
NodeDetails nodeDetails = this.fetchNodeDetails.getNodeDetails("glipandroid", "hello@tor.us").get();
NodeDetails nodeDetails = this.fetchNodeDetails.getNodeDetails("google", "hello@tor.us").get();
assertEquals(Config.AQUA, nodeDetails);
}

@DisplayName("Gets the Node details for Celeste")
@Test
public void shouldGetNodeDetailsCeleste() throws ExecutionException, InterruptedException {
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.CELESTE, FetchNodeDetails.PROXY_ADDRESS_CELESTE);
NodeDetails nodeDetails = this.fetchNodeDetails.getNodeDetails("google", "hello@tor.us").get();
assertEquals(Config.CELESTE, nodeDetails);
}
}
2 changes: 2 additions & 0 deletions src/test/java/org/torusresearch/fetchnodedetailstest/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class Config {
public static NodeDetails CYAN;

public static NodeDetails AQUA;
public static NodeDetails CELESTE;

static {
try {
Expand All @@ -21,6 +22,7 @@ public class Config {
TESTNET = getNodeDetailsFromFile(basePath + "testnet.json");
CYAN = getNodeDetailsFromFile(basePath + "cyan.json");
AQUA = getNodeDetailsFromFile(basePath + "aqua.json");
CELESTE = getNodeDetailsFromFile(basePath + "celeste.json");
} catch (Exception ex) {
ex.printStackTrace();
}
Expand Down
35 changes: 35 additions & 0 deletions src/test/java/org/torusresearch/fetchnodedetailstest/config/celeste.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"currentEpoch": "1",
"nodeListAddress": "0x6Bffb4e89453069E7487f0fa5c9f4a2D771cce6c",
"torusNodeEndpoints": [
"https://node-1.cluster-6.celeste.web3auth.io/jrpc",
"https://node-2.cluster-6.celeste.web3auth.io/jrpc",
"https://node-3.cluster-6.celeste.web3auth.io/jrpc",
"https://node-4.cluster-6.celeste.web3auth.io/jrpc",
"https://node-5.cluster-6.celeste.web3auth.io/jrpc"
],
"torusNodePub": [
{
"X": "184a61fc08255c33ac8d57da86d957725e45157a4dfe6b80838b9c0acf450133",
"Y": "6b2189341bc8ba97cd849f58bac8d6fa4484c42d57a529797a4d615bf20fbcd"
},
{
"X": "3ca052df886a84096c2b2eded87cbfacab06d5e231b75a0fe8b6bc7fa4ed04a1",
"Y": "1931cb683ff4c8216523f93b72f536dbbfae2c747ef40c48e0676641caf80d2b"
},
{
"X": "498636b9bf53a0cfc337e23f506b1db5ebe55405666a412e23fc3ac5b289450b",
"Y": "10dfdc3f72111c959b48b8caf2e42cfb907406b3efceb3d4d7b191a003094519"
},
{
"X": "cd6541b449452f607705b0687b9aaaf3d3bd02bd615a5a80bfcb12201e12ade9",
"Y": "3c1ef1d370c1dff494ae6360093e77df055b744dcf146d8b47ecb6dfd163d5af"
},
{
"X": "7cb92d08513fca39e09b22d6d9ee5cc4e8ad782126067e0fb72c4717209fad3b",
"Y": "b4c1fd6cb8beae828d6318cc7b085c2d80bdc51b46c086147d1537dab8ebae9b"
}
],
"torusIndexes": [1, 2, 3, 4, 5],
"updated": true
}
2 changes: 1 addition & 1 deletion src/test/java/org/torusresearch/fetchnodedetailstest/config/testnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"currentEpoch": "15",
"nodeListAddress": "0x6258c9d6c12ed3edda59a1a6527e469517744aa7",
"nodeListAddress": "0xd084604e5FA387FbC2Da8bAab07fDD6aDED4614A",
"torusNodeEndpoints": [
"https://teal-15-1.torusnode.com/jrpc",
"https://teal-15-3.torusnode.com/jrpc",
Expand Down