Skip to content

Commit 8220869

Browse files
gosticksgosticks
committed
fixed packages
1 parent 9191ac1 commit 8220869

16 files changed

+35
-36
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If you have any ideas please submit a request (I am totally not a Java guy so...
1212
- [x] updateLeafToRoot
1313
- [x] getDigest
1414

15-
#### com.flashwifi.flashwrapper.Model.Transfer
15+
#### Transfer
1616
- [x] prepare
1717
- [x] compose
1818
- [x] close (needs testing)
@@ -28,7 +28,7 @@ If you have any ideas please submit a request (I am totally not a Java guy so...
2828
1. Clone repo
2929
2. Update maven ressources
3030
3. That's it.
31-
4. You can run a test transaction by running the main func in the com.flashwifi.flashwrapper.Main Class.
31+
4. You can run a test transaction by running the main func in the Main Class.
3232

3333

3434

‎src/main/java/com/flashwifi/flashwrapper/Helpers.java renamed to ‎src/main/java/iotaFlashWrapper/Helpers.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.flashwifi.flashwrapper;
1+
package iotaFlashWrapper;
22

3-
import com.flashwifi.flashwrapper.Model.*;
3+
import iotaFlashWrapper.Model.*;
44

55

66
import java.util.ArrayList;
@@ -76,7 +76,7 @@ public static ArrayList<Bundle> appliedSignatures(ArrayList<Bundle> bundles, Arr
7676
public static void applyTransfers(UserObject user, ArrayList<Bundle> bundles) {
7777
FlashObject flash = IotaFlashBridge.applyTransfersToUser(user, bundles);
7878
user.setFlash(flash);
79-
// com.flashwifi.flashwrapper.IotaFlashBridge.applyTransfers(
79+
// IotaFlashBridge.applyTransfers(
8080
// user.getFlash().getRoot(),
8181
// user.getFlash().getDeposits(),
8282
// user.getFlash().getOutputs(),

‎src/main/java/com/flashwifi/flashwrapper/IotaFlashBridge.java renamed to ‎src/main/java/iotaFlashWrapper/IotaFlashBridge.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.flashwifi.flashwrapper;
2-
3-
import com.flashwifi.flashwrapper.Model.*;
1+
package iotaFlashWrapper;
42
import com.eclipsesource.v8.*;
53
import com.eclipsesource.v8.utils.V8ObjectUtils;
4+
import iotaFlashWrapper.Model.*;
65

76

87
import java.io.IOException;
@@ -32,7 +31,7 @@ public static void boot() throws IOException {
3231
transfer = (V8Object) engine.executeScript("iotaFlash.transfer");
3332
helper = (V8Object) engine.executeScript("Helper");
3433

35-
com.flashwifi.flashwrapper.Model.Console console = new com.flashwifi.flashwrapper.Model.Console();
34+
Console console = new Console();
3635
V8Object v8Console = new V8Object(engine);
3736
engine.add("console", v8Console);
3837
v8Console.registerJavaMethod(console, "log", "log", new Class<?>[] { String.class });

‎src/main/java/com/flashwifi/flashwrapper/IotaFlashInterface.java renamed to ‎src/main/java/iotaFlashWrapper/IotaFlashInterface.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.flashwifi.flashwrapper;
1+
package iotaFlashWrapper;
22

3-
import com.flashwifi.flashwrapper.Model.Bundle;
4-
import com.flashwifi.flashwrapper.Model.Digest;
5-
import com.flashwifi.flashwrapper.Model.MultisigAddress;
6-
import com.flashwifi.flashwrapper.Model.Transfer;
3+
import iotaFlashWrapper.Model.Bundle;
4+
import iotaFlashWrapper.Model.Digest;
5+
import iotaFlashWrapper.Model.MultisigAddress;
6+
import iotaFlashWrapper.Model.Transfer;
77

88
import java.util.ArrayList;
99
import java.util.List;
@@ -14,7 +14,7 @@ public interface IotaFlashInterface {
1414

1515
public void updateLeafToRoot(MultisigAddress root);
1616

17-
// com.flashwifi.flashwrapper.Model.Transfer
17+
// Transfer
1818
public Object prepare(ArrayList<String> settlementAddresses, ArrayList<Integer> deposits, int index, ArrayList<Transfer> transfers);
1919
public List<Object> compose(int balance, ArrayList<Integer> deposits, ArrayList<Transfer> outputs, MultisigAddress root, String remainderAddress, ArrayList<Bundle> history, ArrayList<Transfer> transfers, boolean close);
2020

‎src/main/java/com/flashwifi/flashwrapper/Main.java renamed to ‎src/main/java/iotaFlashWrapper/Main.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.flashwifi.flashwrapper;
1+
package iotaFlashWrapper;
22

3-
import com.flashwifi.flashwrapper.Model.*;
3+
import iotaFlashWrapper.Model.*;
44

55
import java.io.IOException;
66
import java.util.ArrayList;
@@ -134,7 +134,7 @@ public static void main(String[] argv) throws Exception {
134134
/*
135135
136136
// Supplying the CORRECT varibles to create a closing bundle
137-
bundles = com.flashwifi.flashwrapper.Helpers.createTransaction(
137+
bundles = Helpers.createTransaction(
138138
oneFlash,
139139
oneFlash.getFlash().getSettlementAddresses(),
140140
true
@@ -144,10 +144,10 @@ public static void main(String[] argv) throws Exception {
144144
/// SIGN BUNDLES
145145
146146
// Get signatures for the bundles
147-
oneSignatures = com.flashwifi.flashwrapper.Helpers.signTransaction(oneFlash, bundles)
147+
oneSignatures = Helpers.signTransaction(oneFlash, bundles)
148148
149149
// Generate USER TWO'S Singatures
150-
twoSignatures = com.flashwifi.flashwrapper.Helpers.signTransaction(twoFlash, bundles)
150+
twoSignatures = Helpers.signTransaction(twoFlash, bundles)
151151
152152
// Sign bundle with your USER ONE'S signatures
153153
signedBundles = transfer.appliedSignatures(bundles, oneSignatures)
@@ -159,12 +159,12 @@ public static void main(String[] argv) throws Exception {
159159
/// APPLY SIGNED BUNDLES
160160
161161
// Apply transfers to User ONE
162-
oneFlash = com.flashwifi.flashwrapper.Helpers.applyTransfers(oneFlash, signedBundles)
162+
oneFlash = Helpers.applyTransfers(oneFlash, signedBundles)
163163
// Save latest channel bundles
164164
oneFlash.bundles = signedBundles
165165
166166
// Apply transfers to User TWO
167-
twoFlash = com.flashwifi.flashwrapper.Helpers.applyTransfers(twoFlash, signedBundles)
167+
twoFlash = Helpers.applyTransfers(twoFlash, signedBundles)
168168
// Save latest channel bundles
169169
twoFlash.bundles = signedBundles
170170

‎src/main/java/com/flashwifi/flashwrapper/Model/Bundle.java renamed to ‎src/main/java/iotaFlashWrapper/Model/Bundle.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import java.util.ArrayList;
44
import java.util.HashMap;

‎src/main/java/com/flashwifi/flashwrapper/Model/Console.java renamed to ‎src/main/java/iotaFlashWrapper/Model/Console.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33

44
public class Console {

‎src/main/java/com/flashwifi/flashwrapper/Model/CreateTransactionHelperObject.java renamed to ‎src/main/java/iotaFlashWrapper/Model/CreateTransactionHelperObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
public class CreateTransactionHelperObject {
44
private int generate = 0;

‎src/main/java/com/flashwifi/flashwrapper/Model/Digest.java renamed to ‎src/main/java/iotaFlashWrapper/Model/Digest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import java.util.HashMap;
44
import java.util.Map;

‎src/main/java/com/flashwifi/flashwrapper/Model/FlashObject.java renamed to ‎src/main/java/iotaFlashWrapper/Model/FlashObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import java.util.ArrayList;
44
import java.util.HashMap;

‎src/main/java/com/flashwifi/flashwrapper/Model/MultisigAddress.java renamed to ‎src/main/java/iotaFlashWrapper/Model/MultisigAddress.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import com.eclipsesource.v8.V8;
44
import com.eclipsesource.v8.V8Object;

‎src/main/java/com/flashwifi/flashwrapper/Model/Signature.java renamed to ‎src/main/java/iotaFlashWrapper/Model/Signature.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import java.util.ArrayList;
44
import java.util.List;
55

66
/**
7-
* This class represents an com.flashwifi.flashwrapper.Model.Signature.
7+
* This class represents an Signature.
88
*
99
* @author Adrian
1010
**/
@@ -15,7 +15,7 @@ public class Signature {
1515
private List<String> signatureFragments;
1616

1717
/**
18-
* Initializes a new instance of the com.flashwifi.flashwrapper.Model.Signature class.
18+
* Initializes a new instance of the Signature class.
1919
*/
2020
public Signature() {
2121
this.signatureFragments = new ArrayList<>();

‎src/main/java/com/flashwifi/flashwrapper/Model/Transaction.java renamed to ‎src/main/java/iotaFlashWrapper/Model/Transaction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import java.util.HashMap;
44
import java.util.Map;

‎src/main/java/com/flashwifi/flashwrapper/Model/Transfer.java renamed to ‎src/main/java/iotaFlashWrapper/Model/Transfer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import com.google.gson.Gson;
44

‎src/main/java/com/flashwifi/flashwrapper/Model/UserObject.java renamed to ‎src/main/java/iotaFlashWrapper/Model/UserObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flashwifi.flashwrapper.Model;
1+
package iotaFlashWrapper.Model;
22

33
import java.util.ArrayList;
44
import java.util.HashMap;

‎src/main/java/com/flashwifi/flashwrapper/V8Converter.java renamed to ‎src/main/java/iotaFlashWrapper/V8Converter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.flashwifi.flashwrapper;
1+
package iotaFlashWrapper;
22

3-
import com.flashwifi.flashwrapper.Model.*;
43
import com.eclipsesource.v8.V8;
54
import com.eclipsesource.v8.V8Array;
65
import com.eclipsesource.v8.V8Object;
76
import com.eclipsesource.v8.utils.V8ObjectUtils;
7+
import iotaFlashWrapper.Model.*;
88

99
import java.util.ArrayList;
1010
import java.util.HashMap;

0 commit comments

Comments
 (0)