Skip to content

Commit

Permalink
switch to java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
@neodix42
neodix42 committed Feb 5, 2025
1 parent a7b8df1 commit ac754b9
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 143 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
</modules>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
164 changes: 24 additions & 140 deletions tonlib/src/test/java/org/ton/java/tonlib/TestTonlibJsonTestnet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,14 @@ public class TestTonlibJsonTestnet {

static String tonlibPath = Utils.getArtifactGithubUrl("tonlibjson", "latest", "neodix42", "ton");

// Tonlib tonlib =
// Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).verbosityLevel(VerbosityLevel.DEBUG).build();
// Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();
// Tonlib tonlib = null;

// String tonlibPath = "tonlibjson-prev.dll";

@Test
public void testGetLiteServerVersion() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

LiteServerVersion liteServerVersion = tonlib.getLiteServerVersion();
log.info("liteServerVersion {}", liteServerVersion);
Expand All @@ -58,12 +52,7 @@ public void testGetLiteServerVersion() {

@Test
public void testTonlibGetLast() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

BlockIdExt fullblock = tonlib.getLast().getLast();
log.info("last {}", fullblock);
Expand All @@ -74,12 +63,7 @@ public void testTonlibGetLast() {
@Test
public void testTonlibGetAllBlockTransactions() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

BlockIdExt fullblock = tonlib.getLast().getLast();
assertThat(fullblock).isNotNull();
Expand Down Expand Up @@ -115,12 +99,7 @@ public void testTonlibGetAllBlockTransactions() {
@Test
public void testTonlibGetBlockTransactions() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

for (int i = 0; i < 2; i++) {

Expand Down Expand Up @@ -171,12 +150,7 @@ public void testTonlibGetBlockTransactions() {

@Test
public void testTonlibGetTxsByAddress() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address = Address.of(TON_FOUNDATION);

Expand Down Expand Up @@ -215,12 +189,7 @@ public void testTonlibGetTxsByAddress() {
@Test
public void testTonlibGetTxsByAddressTestnet() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address =
Address.of("0:b52a16ba3735501df19997550e7ed4c41754ee501ded8a841088ce4278b66de4");
Expand Down Expand Up @@ -259,12 +228,7 @@ public void testTonlibGetTxsByAddressTestnet() {
@Test
public void testTonlibGetTxsV2ByAddressTestnet() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address =
Address.of("0:b52a16ba3735501df19997550e7ed4c41754ee501ded8a841088ce4278b66de4");
Expand Down Expand Up @@ -305,12 +269,7 @@ public void testTonlibGetTxsV2ByAddressTestnet() {
@Test
public void testTonlibGetAllTxsByAddress() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address = Address.of("EQAL66-DGwFvP046ysD_o18wvwt-0A6_aJoVmQpVNIqV_ZvK");

Expand Down Expand Up @@ -346,12 +305,7 @@ public void testTonlibGetAllTxsByAddress() {
@Test
public void testTonlibGetAllTxsByAddressWithMemo() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address = Address.of("EQCQxq9F4-RSaO-ya7q4CF26yyCaQNY98zgD5ys3ZbbiZdUy");

Expand Down Expand Up @@ -417,12 +371,7 @@ public void testTonlibGetAllTxsByAddressWithMemo() {
@Test
public void testTonlibNewKey() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Key key = tonlib.createNewKey();
log.info(key.toString());
Expand All @@ -443,12 +392,7 @@ public void testTonlibNewKey() {
@Test
public void testTonlibEncryptDecryptKey() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

String secret = "Q3i3Paa45H/F/Is+RW97lxW0eikF0dPClSME6nbogm0=";
String dataToEncrypt = Utils.stringToBase64("ABC");
Expand All @@ -466,12 +410,7 @@ public void testTonlibEncryptDecryptKey() {
@Test
public void testTonlibEncryptDecryptMnemonic() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

String base64mnemonic =
Utils.stringToBase64(
Expand All @@ -490,12 +429,7 @@ public void testTonlibEncryptDecryptMnemonic() {
public void testTonlibEncryptDecryptMnemonicModule()
throws NoSuchAlgorithmException, InvalidKeyException {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

String base64mnemonic = Utils.stringToBase64(Mnemonic.generateString(24));

Expand All @@ -511,12 +445,7 @@ public void testTonlibEncryptDecryptMnemonicModule()

@Test
public void testTonlibRunMethodParticipantsList() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address =
Address.of("-1:3333333333333333333333333333333333333333333333333333333333333333");
Expand All @@ -538,12 +467,7 @@ public void testTonlibRunMethodParticipantsList() {
@Test
public void testTonlibRunMethodActiveElectionId() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address =
Address.of("-1:3333333333333333333333333333333333333333333333333333333333333333");
Expand All @@ -556,12 +480,7 @@ public void testTonlibRunMethodActiveElectionId() {

@Test
public void testTonlibRunMethodPastElectionsId() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address =
Address.of("-1:3333333333333333333333333333333333333333333333333333333333333333");
Expand All @@ -577,12 +496,7 @@ public void testTonlibRunMethodPastElectionsId() {

@Test
public void testTonlibRunMethodPastElections() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address address =
Address.of("-1:3333333333333333333333333333333333333333333333333333333333333333");
Expand All @@ -596,12 +510,7 @@ public void testTonlibRunMethodPastElections() {
@Test
public void testTonlibGetConfig() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

MasterChainInfo mc = tonlib.getLast();
Cell c = tonlib.getConfigParam(mc.getLast(), 22);
Expand All @@ -611,12 +520,7 @@ public void testTonlibGetConfig() {

@Test
public void testTonlibGetConfigAll() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Cell c = tonlib.getConfigAll(128);
log.info(c.print());
Expand All @@ -625,12 +529,7 @@ public void testTonlibGetConfigAll() {

@Test
public void testTonlibLoadContract() {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

AccountAddressOnly address =
AccountAddressOnly.builder()
Expand All @@ -644,12 +543,7 @@ public void testTonlibLoadContract() {
@Test
public void testTonlibRunMethodComputeReturnedStake() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

Address elector = Address.of(ELECTOR_ADDRESSS);
RunResult result = tonlib.runMethod(elector, "compute_returned_stake", new ArrayDeque<>());
Expand All @@ -670,12 +564,7 @@ public void testTonlibRunMethodComputeReturnedStake() {
@Test
public void testTonlibLookupBlock() {
try {
Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

MasterChainInfo mcInfo = tonlib.getLast();

Expand All @@ -696,12 +585,7 @@ public void testTonlibLookupBlock() {
@Test
public void testTonlibGetConfigs() {

Tonlib tonlib =
Tonlib.builder()
.pathToTonlibSharedLib(tonlibPath)
.testnet(true)
.verbosityLevel(VerbosityLevel.DEBUG)
.build();
Tonlib tonlib = Tonlib.builder().pathToTonlibSharedLib(tonlibPath).testnet(true).build();

log.info("config0 {}", tonlib.getConfigParam0());
log.info("config1 {}", tonlib.getConfigParam1());
Expand Down

0 comments on commit ac754b9

Please sign in to comment.