Commit 99a7599d authored by Malena López-Batista's avatar Malena López-Batista

Update public available nodes

parent 897e1507
Pipeline #161935059 canceled with stages
......@@ -17,7 +17,7 @@ import java.math.BigInteger
class DexterTokenClientRealTest {
private fun testAddLiquidity(
nodeUrl: String = TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE,
nodeUrl: String = TezosNodeClient.CARTHAGENET_SMARTPY_NODE,
dexterContractAddress: Address = DEXTER_TZG_ADDRESS,
from: Wallet = delegatorWallet!!,
amount: Tez = Tez(1.0),
......@@ -47,7 +47,7 @@ class DexterTokenClientRealTest {
}
private fun testGetExchangeBalance(
nodeUrl: String = TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE,
nodeUrl: String = TezosNodeClient.CARTHAGENET_SMARTPY_NODE,
dexterContractAddress: Address = DEXTER_TZS_ADDRESS,
tokenContractAddress: Address = TokenContractRealTest.STKR_MOCK_ADDRESS
) {
......@@ -66,7 +66,7 @@ class DexterTokenClientRealTest {
}
private fun testGetExchangeTokenBalance(
nodeUrl: String = TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE,
nodeUrl: String = TezosNodeClient.CARTHAGENET_SMARTPY_NODE,
dexterContractAddress: Address = DEXTER_TZS_ADDRESS,
tokenContractAddress: Address = TokenContractRealTest.STKR_MOCK_ADDRESS
) {
......
......@@ -74,7 +74,7 @@ class TezosNodeClientRealTest {
val executorService = Executors.newFixedThreadPool(3)
val service =
BlockchainMetadataService(
DefaultNetworkClient(TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE, true),
DefaultNetworkClient(TezosNodeClient.CARTHAGENET_SMARTPY_NODE, true),
executorService
)
service.getMetadata(TEST_ADDRESS_TZ1_WRO)
......@@ -352,7 +352,7 @@ class TezosNodeClientRealTest {
}
//const val LOCAL_NODE_URL = "http://127.0.0.1:8732"
const val LOCAL_NODE_URL = TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE
const val LOCAL_NODE_URL = TezosNodeClient.CARTHAGENET_SMARTPY_NODE
const val TEST_SAMPLE_CONTRACT = "KT194hQVCPCsCYUhDjbeUCwpKcKyzN3AZLbc" // idString.tz
......
......@@ -19,7 +19,7 @@ import java.math.BigInteger
class TokenContractRealTest {
private fun testTokenBalance(
nodeUrl: String = TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE,
nodeUrl: String = TezosNodeClient.CARTHAGENET_SMARTPY_NODE,
tokenContractAddress: Address = STKR_MOCK_ADDRESS,
userAddress: Address = USER_WITH_TOKENS_ADDRESS
) {
......@@ -42,7 +42,7 @@ class TokenContractRealTest {
}
private fun testSendToken(
nodeUrl: String = TezosNodeClient.CARTHAGENET_CRYPTIUM_NODE,
nodeUrl: String = TezosNodeClient.CARTHAGENET_SMARTPY_NODE,
tokenContractAddress: Address = STKR_MOCK_ADDRESS,
from: Wallet = delegatorWallet!!,
to: Address = bakerWallet1!!.address
......
......@@ -21,6 +21,7 @@ package io.camlcase.javatezos.test.network.test
import io.camlcase.javatezos.ClientWrapper
import io.camlcase.javatezos.TezosNodeClient
import io.camlcase.javatezos.TezosNodeClient.Companion.CARTHAGENET_SMARTPY_NODE
import io.camlcase.javatezos.network.DefaultNetworkClient
import io.camlcase.javatezos.network.defaultClientBuilder
import io.camlcase.javatezos.operation.ForgingService
......@@ -67,16 +68,6 @@ class CamlCredentials {
return properties.getProperty("node-testnet")
}
fun parsingNodeUrl(): String {
return properties.getProperty("node-testnet-parsing")
}
fun parsingNodeCredentials(): Pair<String, String> {
val username = properties.getProperty("node-testnet-parsing-user")
val pass = properties.getProperty("node-testnet-parsing-password")
return Pair(username, pass)
}
fun nodeCredentials(): Pair<String, String> {
val username = properties.getProperty("node-testnet-user")
val pass = properties.getProperty("node-testnet-password")
......@@ -89,9 +80,9 @@ class CamlCredentials {
fun createValidatorNetworkClient(): DefaultNetworkClient {
return DefaultNetworkClient(
parsingNodeUrl(),
CARTHAGENET_SMARTPY_NODE,
emptyList(),
CamlTezosClient(true, parsingNodeCredentials())
CamlTezosClient(true, null)
)
}
}
......
......@@ -5,7 +5,7 @@
*/
package io.camlcase.javatezos.test.util
import io.camlcase.javatezos.TezosNodeClient.Companion.CARTHAGENET_CRYPTONOMIC_NODE
import io.camlcase.javatezos.TezosNodeClient.Companion.CARTHAGENET_SMARTPY_NODE
import io.camlcase.javatezos.model.TezosError
import io.github.vjames19.futures.jdk8.onComplete
import org.junit.Assert
......@@ -29,4 +29,4 @@ fun <T> CompletableFuture<T>.testFailure(countDownLatch: CountDownLatch, verific
}
const val VALIDATOR_NODE_URL = CARTHAGENET_CRYPTONOMIC_NODE
const val VALIDATOR_NODE_URL = CARTHAGENET_SMARTPY_NODE
......@@ -672,10 +672,10 @@ class TezosNodeClient(
companion object {
// MainNet
const val MAINNET_TEZTECH_NODE = "https://rpc.tezrpc.me"
const val MAINNET_CRYPTIUM_NODE = "https://mainnet.tezos.cryptium.ch:8732"
const val MAINNET_SMARTPY_NODE = "https://mainnet.smartpy.io"
// CarthageNet
const val CARTHAGENET_CRYPTIUM_NODE = "http://carthagenet.tezos.cryptium.ch:8732"
const val CARTHAGENET_SMARTPY_NODE = "https://carthagenet.smartpy.io"
const val CARTHAGENET_CRYPTONOMIC_NODE = "https://tezos-dev.cryptonomic-infra.tech:443"
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment