forked from Qortal/qortal
Merge branch 'master' into pirate-chain
# Conflicts: # src/test/java/org/qortal/test/crosschain/DigibyteTests.java # src/test/java/org/qortal/test/crosschain/RavencoinTests.java
This commit is contained in:
commit
3fc4746a52
2
pom.xml
2
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.qortal</groupId>
|
<groupId>org.qortal</groupId>
|
||||||
<artifactId>qortal</artifactId>
|
<artifactId>qortal</artifactId>
|
||||||
<version>3.2.5</version>
|
<version>3.3.0</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<skipTests>true</skipTests>
|
<skipTests>true</skipTests>
|
||||||
|
@ -81,8 +81,8 @@ public class DigibyteTests extends Common {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetWalletBalance() throws ForeignBlockchainException {
|
public void testGetWalletBalance() {
|
||||||
String xprv58 = "tprv8ZgxMBicQKsPdahhFSrCdvC1bsWyzHHZfTneTVqUXN6s1wEtZLwAkZXzFP6TYLg2aQMecZLXLre5bTVGajEB55L1HYJcawpdFG66STVAWPJ";
|
String xprv58 = "xpub661MyMwAqRbcEnabTLX5uebYcsE3uG5y7ve9jn1VK8iY1MaU3YLoLJEe8sTu2YVav5Zka5qf2dmMssfxmXJTqZnazZL2kL7M2tNKwEoC34R";
|
||||||
|
|
||||||
Long balance = digibyte.getWalletBalance(xprv58);
|
Long balance = digibyte.getWalletBalance(xprv58);
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ public class DigibyteTests extends Common {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetUnusedReceiveAddress() throws ForeignBlockchainException {
|
public void testGetUnusedReceiveAddress() throws ForeignBlockchainException {
|
||||||
String xprv58 = "tprv8ZgxMBicQKsPdahhFSrCdvC1bsWyzHHZfTneTVqUXN6s1wEtZLwAkZXzFP6TYLg2aQMecZLXLre5bTVGajEB55L1HYJcawpdFG66STVAWPJ";
|
String xprv58 = "xpub661MyMwAqRbcEnabTLX5uebYcsE3uG5y7ve9jn1VK8iY1MaU3YLoLJEe8sTu2YVav5Zka5qf2dmMssfxmXJTqZnazZL2kL7M2tNKwEoC34R";
|
||||||
|
|
||||||
String address = digibyte.getUnusedReceiveAddress(xprv58);
|
String address = digibyte.getUnusedReceiveAddress(xprv58);
|
||||||
|
|
||||||
|
@ -81,8 +81,8 @@ public class RavencoinTests extends Common {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetWalletBalance() throws ForeignBlockchainException {
|
public void testGetWalletBalance() {
|
||||||
String xprv58 = "tprv8ZgxMBicQKsPdahhFSrCdvC1bsWyzHHZfTneTVqUXN6s1wEtZLwAkZXzFP6TYLg2aQMecZLXLre5bTVGajEB55L1HYJcawpdFG66STVAWPJ";
|
String xprv58 = "xpub661MyMwAqRbcEt3Ge1wNmkagyb1J7yTQu4Kquvy77Ycg2iPoh7Urg8s9Jdwp7YmrqGkDKJpUVjsZXSSsQgmAVUC17ZVQQeoWMzm7vDTt1y7";
|
||||||
|
|
||||||
Long balance = ravencoin.getWalletBalance(xprv58);
|
Long balance = ravencoin.getWalletBalance(xprv58);
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ public class RavencoinTests extends Common {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetUnusedReceiveAddress() throws ForeignBlockchainException {
|
public void testGetUnusedReceiveAddress() throws ForeignBlockchainException {
|
||||||
String xprv58 = "tprv8ZgxMBicQKsPdahhFSrCdvC1bsWyzHHZfTneTVqUXN6s1wEtZLwAkZXzFP6TYLg2aQMecZLXLre5bTVGajEB55L1HYJcawpdFG66STVAWPJ";
|
String xprv58 = "xpub661MyMwAqRbcEt3Ge1wNmkagyb1J7yTQu4Kquvy77Ycg2iPoh7Urg8s9Jdwp7YmrqGkDKJpUVjsZXSSsQgmAVUC17ZVQQeoWMzm7vDTt1y7";
|
||||||
|
|
||||||
String address = ravencoin.getUnusedReceiveAddress(xprv58);
|
String address = ravencoin.getUnusedReceiveAddress(xprv58);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user