harald/opretj
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

move

Browse source
This commit is contained in:
Harald Hoyer 2016-09-14 10:45:38 +02:00
parent 765b452f7d
commit f68d85cea0
8 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
opret-testapp/pom.xml
View file

@ -80,7 +80,7 @@
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix> <classpathPrefix>lib/</classpathPrefix>
<mainClass>org.tcpid.opretj.testapp.App</mainClass> <mainClass>org.tcpid.opret.App</mainClass>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
@ -129,7 +129,7 @@
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version> <version>1.2.1</version>
<configuration> <configuration>
<mainClass>org.tcpid.opretj.testapp.App</mainClass> <mainClass>org.tcpid.opret.App</mainClass>
<!-- <systemProperties> <systemProperty> <key>logback.configurationFile</key> <!-- <systemProperties> <systemProperty> <key>logback.configurationFile</key>
<value>${basedir}/opret-testapp/src/main/resources/logback.xml</value> </systemProperty> <value>${basedir}/opret-testapp/src/main/resources/logback.xml</value> </systemProperty>
</systemProperties> --> </systemProperties> -->

2
opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECEventListener.java → opret-testapp/src/main/java/org/tcpid/opret/OPRETECEventListener.java
View file

@ -1,4 +1,4 @@
package org.tcpid.opretj.testapp; package org.tcpid.opret;
import org.tcpid.key.MasterVerifyKey; import org.tcpid.key.MasterVerifyKey;

2
opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECParser.java → opret-testapp/src/main/java/org/tcpid/opret/OPRETECParser.java
View file

@ -1,4 +1,4 @@
package org.tcpid.opretj.testapp; package org.tcpid.opret;
import static org.bitcoinj.script.ScriptOpCodes.OP_RETURN; import static org.bitcoinj.script.ScriptOpCodes.OP_RETURN;
import static org.libsodium.jni.NaCl.sodium; import static org.libsodium.jni.NaCl.sodium;

1
opret-testapp/src/main/java/org/tcpid/opretj/testapp/App.java
View file

@ -22,6 +22,7 @@ import org.libsodium.jni.crypto.Hash;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.tcpid.key.MasterSigningKey; import org.tcpid.key.MasterSigningKey;
import org.tcpid.opret.OPRETECParser;
import org.tcpid.opretj.OPRETWallet; import org.tcpid.opretj.OPRETWallet;
import org.tcpid.opretj.OPRETWalletAppKit; import org.tcpid.opretj.OPRETWalletAppKit;

4
opret-testapp/src/main/resources/logback.xml
View file

@ -8,13 +8,13 @@
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>
<logger name="org.tcpid.opretj.testapp.App" level="debug" /> <logger name="org.tcpid.opret.App" level="debug" />
<logger name="org.bitcoinj.core.listeners.DownloadProgressTracker" level="info" /> <logger name="org.bitcoinj.core.listeners.DownloadProgressTracker" level="info" />
<logger name="org.bitcoinj.core.PeerGroup" level="error" /> <logger name="org.bitcoinj.core.PeerGroup" level="error" />
<logger name="org.bitcoinj.core.AbstractBlockChain" level="error" /> <logger name="org.bitcoinj.core.AbstractBlockChain" level="error" />
<logger name="org.bitcoinj.core.PeerSocketHandler" level="error" /> <logger name="org.bitcoinj.core.PeerSocketHandler" level="error" />
<logger name="org.bitcoinj.net.ConnectionHandler" level="error" /> <logger name="org.bitcoinj.net.ConnectionHandler" level="error" />
<logger name="org.tcpid.opretj.testapp.OPRETECParser" level="debug" /> <logger name="org.tcpid.opret.OPRETECParser" level="debug" />
<!-- <!--
<logger name="eckey.OPRETSimpleLogger" level="debug" /> <logger name="eckey.OPRETSimpleLogger" level="debug" />
<logger name="eckey.OPRETSimpleParser" level="debug" /> <logger name="eckey.OPRETSimpleParser" level="debug" />

2
opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestCrypto.java → opret-testapp/src/test/java/org/tcpid/opret/TestCrypto.java
View file

@ -1,4 +1,4 @@
package org.tcpid.opretj.testapp; package org.tcpid.opret;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

8
opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestECA1.java → opret-testapp/src/test/java/org/tcpid/opret/TestECA1.java
View file

@ -1,7 +1,7 @@
/** /**
* *
*/ */
package org.tcpid.opretj.testapp; package org.tcpid.opret;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -17,8 +17,8 @@ import org.libsodium.jni.encoders.Encoder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.tcpid.key.MasterVerifyKey; import org.tcpid.key.MasterVerifyKey;
import org.tcpid.opret.OPRETECParser;
import org.tcpid.opretj.OPRETTransaction; import org.tcpid.opretj.OPRETTransaction;
import org.tcpid.opretj.testapp.OPRETECParser;
import com.google.common.primitives.Bytes; import com.google.common.primitives.Bytes;
@ -27,7 +27,7 @@ public class TestECA1 {
/** /**
* Test method for * Test method for
* {@link org.tcpid.opretj.testapp.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}. * {@link org.tcpid.opret.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}.
*/ */
@Test @Test
public void testPushTransaction() { public void testPushTransaction() {
@ -101,7 +101,7 @@ public class TestECA1 {
/** /**
* Test method for * Test method for
* {@link org.tcpid.opretj.testapp.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}. * {@link org.tcpid.opret.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}.
*/ */
@Test @Test
public void testPushTransactionWithNonce() { public void testPushTransactionWithNonce() {

4
opretj/src/main/java/org/tcpid/opretj/OPRETHandlerInterface.java
View file

@ -6,8 +6,6 @@ import java.util.concurrent.Executor;
public interface OPRETHandlerInterface { public interface OPRETHandlerInterface {
// void addOPRET(byte[] magic, long earliestTime);
void addOPRETChangeEventListener(Executor executor, OPRETChangeEventListener listener); void addOPRETChangeEventListener(Executor executor, OPRETChangeEventListener listener);
long getEarliestElementCreationTime(); long getEarliestElementCreationTime();
@ -16,8 +14,6 @@ public interface OPRETHandlerInterface {
Set<List<Byte>> getOPRETSet(); Set<List<Byte>> getOPRETSet();
// void removeOPRET(byte[] magic);
boolean pushTransaction(OPRETTransaction t); boolean pushTransaction(OPRETTransaction t);
boolean removeOPRETChangeEventListener(OPRETChangeEventListener listener); boolean removeOPRETChangeEventListener(OPRETChangeEventListener listener);