Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit 8f15095

Browse files
author
Brord van Wierst
authored
Merge pull request #203 from kwek20/test-devnet-fix
Test devnet fix
2 parents 80aa571 + 29c292c commit 8f15095

File tree

5 files changed

+19
-36
lines changed

5 files changed

+19
-36
lines changed

‎jota/src/main/java/org/iota/jota/store/JsonFlatFileStore.java

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.io.InputStream;
66
import java.io.OutputStream;
77
import java.io.Serializable;
8-
import java.net.URI;
98
import java.util.Collections;
109
import java.util.HashMap;
1110
import java.util.Map;

‎jota/src/test/java/org/iota/jota/IotaAPITest.java

+10-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package org.iota.jota;
22

3-
import static org.hamcrest.MatcherAssert.*;
4-
import static org.junit.jupiter.api.Assertions.*;
3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.junit.jupiter.api.Assertions.assertEquals;
5+
import static org.junit.jupiter.api.Assertions.assertFalse;
6+
import static org.junit.jupiter.api.Assertions.assertNotNull;
7+
import static org.junit.jupiter.api.Assertions.assertThrows;
8+
import static org.junit.jupiter.api.Assertions.assertTrue;
9+
import static org.junit.jupiter.api.Assertions.fail;
510

611
import java.util.ArrayList;
712
import java.util.List;
@@ -11,7 +16,7 @@
1116
import org.iota.jota.builder.AddressRequest;
1217
import org.iota.jota.config.types.FileConfig;
1318
import org.iota.jota.config.types.IotaDefaultConfig;
14-
import org.iota.jota.dto.response.*;
19+
import org.iota.jota.dto.response.BroadcastTransactionsResponse;
1520
import org.iota.jota.dto.response.CheckConsistencyResponse;
1621
import org.iota.jota.dto.response.GetAccountDataResponse;
1722
import org.iota.jota.dto.response.GetBalancesAndFormatResponse;
@@ -27,21 +32,13 @@
2732
import org.iota.jota.model.Input;
2833
import org.iota.jota.model.Transaction;
2934
import org.iota.jota.model.Transfer;
30-
3135
import org.iota.jota.pow.pearldiver.PearlDiverLocalPoW;
32-
3336
import org.iota.jota.utils.Constants;
3437
import org.junit.jupiter.api.BeforeEach;
3538
import org.junit.jupiter.api.Disabled;
3639
import org.junit.jupiter.api.Tag;
3740
import org.junit.jupiter.api.Test;
3841

39-
import static org.junit.jupiter.api.Assertions.assertEquals;
40-
import static org.junit.jupiter.api.Assertions.assertFalse;
41-
import static org.junit.jupiter.api.Assertions.assertNotNull;
42-
import static org.junit.jupiter.api.Assertions.assertThrows;
43-
import static org.junit.jupiter.api.Assertions.fail;
44-
4542
/**
4643
* Let's do some integration test coverage against a devnet node
4744
* Careful with running these tests too fast, the balance might not work in that case
@@ -76,7 +73,7 @@ public class IotaAPITest {
7673
private static final int MIN_WEIGHT_MAGNITUDE = 14;
7774
private static final int MIN_WEIGHT_MAGNITUDE_DEV = 9;
7875

79-
private static final int DEPTH = 9;
76+
private static final int DEPTH = 4;
8077

8178
private static final String[] TEST_ADDRESSES = new String[]{
8279
"LXQHWNY9CQOHPNMKFJFIJHGEPAENAOVFRDIBF99PPHDTWJDCGHLYETXT9NPUVSNKT9XDTDYNJKJCPQMZCCOZVXMTXC"
@@ -87,19 +84,7 @@ public class IotaAPITest {
8784
, "NQEFOAFIYKZOUXDFQ9X9PHCNSDETRTJZINZ9EYGKU99QJLDSTSC9VTBAA9FHLNLNYQXWLTNPRJDWCGIPPYIPAMUSVY"
8885
, "CEGLBSXDJVXGKGOUHRGMAQDRVYXCQLXBKUDWKFFSIABCUYRATFPTEEDIFYGAASKFZYREHLBIXBTKP9KLCRTXEGJXKX"
8986
, "QLOXU9GIQXPPE9UUT9DSIDSIESRIXMTGZJMKLSJTNBCRELAVLWVJLUOLKGFCWAEPEQWZWPBV9YZJJEHUSMBQHBROEZ"
90-
, "XIRMYJSGQXMM9YPHJVVLAVGBBLEEMOOKHHBFWKEAXJFONZLNSLBCGPQEVDMMOGHFVRDSYTETIFOIVNCR9IUZLVJVWX"
91-
, "PDVVBYBXMHZKADPAYOKQNDPHRSWTHAWQ9GRVIBOIMZQTYCWEPCDWDVRSOUNASVBDLBOAMVLYEVVCMAM9NPLXNSO9BD"
92-
, "U9GAIAPUUQWJGISAZWPLHUELTZ9WSHWXS9JLPKOWHRRIVUKGWCTJMBULVMKTETTUNHZ9HWHBALUCJIROUBRIIYCUHC"
93-
, "VFPMKZLLMDUOEKNBEKQZPTNZJZF9UHRWSTHXLWQQ9OAXTZQHTZPAWNJNXKAZFSDFWKFQEKZIGJTLWQFLOBXMPLSQNB"
94-
, "IGHK9XIWOAYBZUEZHQLEXBPTXSWVANIOUZZCPNKUIJIJOJNAQCJWUJHYKCZOIKVAAHDGAWJZKLTPVQL9GJSCYKNWTW"
95-
, "LXQPWMNXSUZTEYNC9ZBBFHY9YWCCOVKBNIIOUSVXZJZMJKJFDUWGUVXYCHGKUHEEIDHSGEWFAHVJPRIJTJCNU9GJAC"
96-
, "AKFDX9PGGQLZUWRMZ9YBDF9CG9TWXCNALCSXSAWHFIMGXCSYCJLSWIQDGGVDRMNEKKECQEYAITGNLNJFQCFALBLRZX"
97-
, "YX9QSPYMSFVOW9UVZRDVOCPYYMUTDHCCPKHMXQSJQJYIXVCHILKW9GBYJTYGLIKBTRQMDCYBMLLNGSSIKNQOHMSKTD"
98-
, "DSYCJKNG9TAGJHSKZQ9XLKAKNSKJFZIPVEDGJFXRTFGENHZFQGXHWDBNXLLDABDMOYELPG9DIXSNJFWARNURMPPVKC"
99-
, "9ANNACZYLDDPZILLQBQG9YMG9XJUMTAENDFQ9HMSSEFWYOAXPJTUXBFTSAXDJPAO9FKTWBBSCSFMOUR9IDQNHAFE9W"
100-
, "WDTFFXHBHMFQQVXQLBFJFVVHVIIAVYM9PFAZCHMKET9ESMHIRHSMVDJBZTXPTAFVIASMSXRDCIYVWVQNODEVYEGMVW"
101-
, "XCCPS9GMTSUB9DXPVKLTBDHOFX9PJMBYZQYQEXMRQDPGQPLWRGZGXODYJKGVFOHHYUJRCSXAIDGYSAWRBRXZJONAYW"
102-
, "KVEBCGMEOPDPRCQBPIEMZTTXYBURGZVNH9PLHKPMM9D9FUKWIGLKZROGNSYIFHULLWQWXCNAW9HKKVIDCTGKHAVBJZ"};
87+
, "XIRMYJSGQXMM9YPHJVVLAVGBBLEEMOOKHHBFWKEAXJFONZLNSLBCGPQEVDMMOGHFVRDSYTETIFOIVNCR9IUZLVJVWX"};
10388

10489
private IotaAPI iotaAPI;
10590

‎jota/src/test/java/org/iota/jota/IotaCoreApiTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import static org.junit.jupiter.api.Assertions.assertThrows;
88
import static org.junit.jupiter.api.Assertions.assertTrue;
99

10+
import java.util.Collections;
11+
1012
import org.hamcrest.core.IsNull;
1113
import org.iota.jota.config.types.FileConfig;
1214
import org.iota.jota.dto.response.AddNeighborsResponse;
@@ -29,8 +31,6 @@
2931
import org.slf4j.Logger;
3032
import org.slf4j.LoggerFactory;
3133

32-
import java.util.Collections;
33-
3434
public class IotaCoreApiTest {
3535

3636
private static final Logger log = LoggerFactory.getLogger(IotaCoreApiTest.class);
@@ -165,7 +165,7 @@ public void shouldGetInclusionStates() throws ArgumentException {
165165
@Test // very long execution
166166
@Tag("IntegrationTest")
167167
public void shouldGetTransactionsToApprove() throws ArgumentException {
168-
GetTransactionsToApproveResponse res = proxy.getTransactionsToApprove(15, null);
168+
GetTransactionsToApproveResponse res = proxy.getTransactionsToApprove(4, null);
169169
assertThat(res.getTrunkTransaction(), IsNull.notNullValue());
170170
assertThat(res.getBranchTransaction(), IsNull.notNullValue());
171171
}
@@ -200,7 +200,7 @@ public void findTransactionsFailIfInvalidTagIsProvided() {
200200
() -> proxy.findTransactions(
201201
new String[]{Checksum.addChecksum(test)}, new String[]{test},
202202
new String[]{test}, new String[]{test}));
203-
assertEquals("[Invalid tag provided.]", argumentException.getMessage());
203+
assertEquals("Invalid tag provided.", argumentException.getMessage());
204204
}
205205

206206
@Test

‎jota/src/test/java/org/iota/jota/IotaLocalPoWTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.iota.jota.model.Transaction;
1515
import org.iota.jota.model.Transfer;
1616
import org.iota.jota.pow.pearldiver.PearlDiverLocalPoW;
17-
1817
import org.junit.jupiter.api.BeforeEach;
1918
import org.junit.jupiter.api.Test;
2019

@@ -28,7 +27,7 @@ public class IotaLocalPoWTest {
2827
private static final String TEST_MESSAGE = "JUSTANOTHERJOTATEST";
2928
private static final String TEST_TAG = "JOTASPAM9999999999999999999";
3029
private static final int MIN_WEIGHT_MAGNITUDE = 14;
31-
private static final int DEPTH = 9;
30+
private static final int DEPTH = 4;
3231

3332
private static final String[] TEST_TRYTES_VALUE_TRANSFER = new String[] {
3433
"999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999NNIWDJKXYXOYEHXQQBOPWSYYKUVNBLBJFRBCPZBTNOG9NJHLSOCANRRGACYCIOYQJATHYUIPOFXLV9URBUIA999999999999999999999999IOTA9ACCOUNTS9TRANSFER999999TQWPAD99C99999999C99999999RTAVSEEHIJEYJYHYPFHTLVQLGGHBBTBWJEWBUCKXWHNBEA9YIIKQOCDIKBLJOPUOKLBCGFDJX9CCQPRIWEQVFKIGQPKTDADIAHNVCCV9OCIAOSTQVDQVFY9YJRITGJJMRGVJPPWIEIPJRZTMTBNWPLMRFPUAHPY999EQVFKIGQPKTDADIAHNVCCV9OCIAOSTQVDQVFY9YJRITGJJMRGVJPPWIEIPJRZTMTBNWPLMRFPUAHPY999IOTA9ACCOUNTS9TRANSFER99999FMBUPTZNF999999999MMMMMMMMMCFQLIPUFO9APITWHAQECZUQ9ONB",

‎jota/src/test/java/org/iota/jota/SendMessageTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.iota.jota;
22

3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.junit.jupiter.api.Assertions.assertEquals;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58

@@ -12,17 +15,14 @@
1215
import org.junit.jupiter.api.BeforeEach;
1316
import org.junit.jupiter.api.Test;
1417

15-
import static org.hamcrest.MatcherAssert.assertThat;
16-
import static org.junit.jupiter.api.Assertions.assertEquals;
17-
1818
public class SendMessageTest {
1919

2020
private static final String TEST_SEED1 = "IHDEENZYITYVYSPKAURUZAQKGVJEREFDJMYTANNXXGPZ9GJWTEOJJ9IPMXOGZNQLSNMFDSQOTZAEETUEA";
2121
private static final String TEST_ADDRESS_WITH_CHECKSUM_SECURITY_LEVEL_2 = "LXQHWNY9CQOHPNMKFJFIJHGEPAENAOVFRDIBF99PPHDTWJDCGHLYETXT9NPUVSNKT9XDTDYNJKJCPQMZCCOZVXMTXC";
2222
private static final String TEST_MESSAGE = "JUSTANOTHERJOTATEST";
2323
private static final String TEST_TAG = "JOTASPAM9999999999999999999";
2424
private static final int MIN_WEIGHT_MAGNITUDE = 14;
25-
private static final int DEPTH = 9;
25+
private static final int DEPTH = 4;
2626

2727
private IotaAPI iotaClient;
2828

0 commit comments

Comments
 (0)