Skip to content

Commit 3e4a30f

Browse files
authored
Add missing license headers, other cleanups (#471)
* releasing 20.1.2 * add license headers. remove dangling imports * dont call the example on start
1 parent 86f239a commit 3e4a30f

File tree

7 files changed

+67
-25
lines changed

7 files changed

+67
-25
lines changed

autobahn/src/main/java/xbr/network/KeySeries.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// AutobahnJava - http://crossbar.io/autobahn
4+
//
5+
// Copyright (c) Crossbar.io Technologies GmbH and contributors
6+
//
7+
// Licensed under the MIT License.
8+
// http://www.opensource.org/licenses/mit-license.php
9+
//
10+
///////////////////////////////////////////////////////////////////////////////
11+
112
package xbr.network;
213

314
import com.fasterxml.jackson.core.JsonProcessingException;

autobahn/src/main/java/xbr/network/SimpleBuyer.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
package xbr.network;
1+
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// AutobahnJava - http://crossbar.io/autobahn
4+
//
5+
// Copyright (c) Crossbar.io Technologies GmbH and contributors
6+
//
7+
// Licensed under the MIT License.
8+
// http://www.opensource.org/licenses/mit-license.php
9+
//
10+
///////////////////////////////////////////////////////////////////////////////
211

12+
package xbr.network;
313

414
import com.fasterxml.jackson.core.type.TypeReference;
515
import com.fasterxml.jackson.databind.ObjectMapper;
616
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
717

8-
import org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi;
9-
import org.bouncycastle.jce.ECKeyUtil;
10-
import org.bouncycastle.jce.interfaces.ECKey;
1118
import org.json.JSONException;
1219
import org.libsodium.jni.SodiumConstants;
13-
import org.web3j.abi.datatypes.generated.Uint256;
1420
import org.web3j.crypto.Credentials;
1521
import org.web3j.crypto.ECKeyPair;
16-
import org.web3j.crypto.Hash;
17-
import org.web3j.crypto.Keys;
1822
import org.web3j.utils.Numeric;
1923

2024
import java.io.IOException;
2125
import java.math.BigInteger;
22-
import java.nio.file.FileAlreadyExistsException;
2326
import java.security.SecureRandom;
2427
import java.util.ArrayList;
2528
import java.util.HashMap;
2629
import java.util.List;
27-
import java.util.Map;
2830
import java.util.concurrent.CompletableFuture;
2931

3032
import io.crossbar.autobahn.wamp.Session;
3133
import io.crossbar.autobahn.wamp.exceptions.ApplicationError;
32-
import io.crossbar.autobahn.wamp.messages.Hello;
33-
import io.crossbar.autobahn.wamp.serializers.CBORSerializer;
34-
import io.reactivex.internal.util.HashMapSupplier;
3534

3635
import static org.libsodium.jni.NaCl.sodium;
3736

@@ -134,14 +133,12 @@ public CompletableFuture<HashMap<String, Object>> balance() {
134133
if (throwable != null) {
135134
future.completeExceptionally(throwable);
136135
} else {
137-
System.out.println(paymentBalance);
138136
mRemainingBalance = new BigInteger((byte[]) paymentBalance.get("remaining"));
139137
HashMap<String, Object> res = new HashMap<>();
140138
res.put("amount", paymentBalance.get("amount"));
141139
res.put("remaining", mRemainingBalance);
142140
res.put("inflight", paymentBalance.get("inflight"));
143141
mSeq = (int) paymentBalance.get("seq");
144-
System.out.println(mRemainingBalance);
145142
future.complete(res);
146143
}
147144
});
@@ -202,7 +199,6 @@ public CompletableFuture<Object> unwrap(byte[] keyID, String encSerializer, byte
202199
int channelSeq = mSeq + 1;
203200
boolean isFinal = false;
204201
try {
205-
System.out.println(quote);
206202
byte[] signature = Util.signEIP712Data(mECKey, channelAddr, channelSeq,
207203
mRemainingBalance.subtract(price), isFinal);
208204
BigInteger remainingPost = mRemainingBalance.subtract(price);

autobahn/src/main/java/xbr/network/SimpleSeller.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// AutobahnJava - http://crossbar.io/autobahn
4+
//
5+
// Copyright (c) Crossbar.io Technologies GmbH and contributors
6+
//
7+
// Licensed under the MIT License.
8+
// http://www.opensource.org/licenses/mit-license.php
9+
//
10+
///////////////////////////////////////////////////////////////////////////////
11+
112
package xbr.network;
213

314
import com.fasterxml.jackson.core.JsonProcessingException;

autobahn/src/main/java/xbr/network/Util.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
package xbr.network;
1+
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// AutobahnJava - http://crossbar.io/autobahn
4+
//
5+
// Copyright (c) Crossbar.io Technologies GmbH and contributors
6+
//
7+
// Licensed under the MIT License.
8+
// http://www.opensource.org/licenses/mit-license.php
9+
//
10+
///////////////////////////////////////////////////////////////////////////////
211

12+
package xbr.network;
313

414
import org.json.JSONArray;
515
import org.json.JSONException;

demo-gallery/src/main/java/io/crossbar/autobahn/demogallery/android/MainActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import androidx.appcompat.app.AppCompatActivity;
1919

2020
import io.crossbar.autobahn.demogallery.R;
21-
import io.crossbar.autobahn.demogallery.xbr.Buyer;
2221

2322

2423
public class MainActivity extends AppCompatActivity implements View.OnClickListener {

demo-gallery/src/main/java/io/crossbar/autobahn/demogallery/xbr/Buyer.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
package io.crossbar.autobahn.demogallery.xbr;
1+
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// AutobahnJava - http://crossbar.io/autobahn
4+
//
5+
// Copyright (c) Crossbar.io Technologies GmbH and contributors
6+
//
7+
// Licensed under the MIT License.
8+
// http://www.opensource.org/licenses/mit-license.php
9+
//
10+
///////////////////////////////////////////////////////////////////////////////
211

3-
import com.fasterxml.jackson.core.JsonProcessingException;
12+
package io.crossbar.autobahn.demogallery.xbr;
413

514
import java.math.BigInteger;
6-
import java.util.ArrayList;
7-
import java.util.HashMap;
815
import java.util.List;
9-
import java.util.Map;
1016

1117
import io.crossbar.autobahn.wamp.Client;
1218
import io.crossbar.autobahn.wamp.Session;
13-
import io.crossbar.autobahn.wamp.types.PublishOptions;
1419
import io.crossbar.autobahn.wamp.types.SessionDetails;
1520
import xbr.network.SimpleBuyer;
16-
import xbr.network.SimpleSeller;
1721
import xbr.network.Util;
1822

1923
public class Buyer {
@@ -40,7 +44,7 @@ private void onJoin(Session session, SessionDetails details) {
4044
mBuyer = new SimpleBuyer(
4145
"0x3e5e9111ae8eb78fe1cc3bb8915d5d461f3ef9a9",
4246
"395df67f0c2d2d9fe1ad08d1bc8b6627011959b79c53d7dd6a3536a33ab8a4fd",
43-
Util.toXBR(100)
47+
Util.toXBR(50)
4448
);
4549
mBuyer.start(session, details.authid).whenComplete((balance, throwable) -> {
4650
mRemainingBalance = balance;

demo-gallery/src/main/java/io/crossbar/autobahn/demogallery/xbr/Seller.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// AutobahnJava - http://crossbar.io/autobahn
4+
//
5+
// Copyright (c) Crossbar.io Technologies GmbH and contributors
6+
//
7+
// Licensed under the MIT License.
8+
// http://www.opensource.org/licenses/mit-license.php
9+
//
10+
///////////////////////////////////////////////////////////////////////////////
11+
112
package io.crossbar.autobahn.demogallery.xbr;
213

314
import com.fasterxml.jackson.core.JsonProcessingException;

0 commit comments

Comments
 (0)