Skip to content

Commit a4f488a

Browse files
stplaydogstplaydog
committed
Revert "change hash package name to crypto (iotaledger-archive#1136)"
This reverts commit e5c581a.
1 parent e5c581a commit a4f488a

34 files changed

+60
-55
lines changed

‎src/main/java/com/iota/iri/Iota.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.iota.iri.conf.TipSelConfig;
66
import com.iota.iri.controllers.TipsViewModel;
77
import com.iota.iri.controllers.TransactionViewModel;
8-
import com.iota.iri.crypto.SpongeFactory;
8+
import com.iota.iri.hash.SpongeFactory;
99
import com.iota.iri.network.Node;
1010
import com.iota.iri.network.TransactionRequester;
1111
import com.iota.iri.network.UDPReceiver;

src/main/java/com/iota/iri/crypto/Curl.java renamed to src/main/java/com/iota/iri/hash/Curl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

33
import com.iota.iri.utils.Converter;
44
import com.iota.iri.utils.Pair;

src/main/java/com/iota/iri/crypto/ISS.java renamed to src/main/java/com/iota/iri/hash/ISS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

33
import java.util.Arrays;
44

src/main/java/com/iota/iri/crypto/ISSInPlace.java renamed to src/main/java/com/iota/iri/hash/ISSInPlace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

33

44
import java.util.Arrays;

src/main/java/com/iota/iri/crypto/Kerl.java renamed to src/main/java/com/iota/iri/hash/Kerl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

33
import com.iota.iri.utils.Converter;
44
import org.bouncycastle.jcajce.provider.digest.Keccak;

src/main/java/com/iota/iri/crypto/PearlDiver.java renamed to src/main/java/com/iota/iri/hash/PearlDiver.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

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

6+
import static com.iota.iri.hash.PearlDiver.State.*;
7+
68
public class PearlDiver {
79

810
enum State {
@@ -24,7 +26,7 @@ enum State {
2426

2527
public void cancel() {
2628
synchronized (syncObj) {
27-
state = State.CANCELLED;
29+
state = CANCELLED;
2830
}
2931
}
3032

@@ -43,7 +45,7 @@ public synchronized boolean search(final byte[] transactionTrits, final int minW
4345

4446
validateParameters(transactionTrits, minWeightMagnitude);
4547
synchronized (syncObj) {
46-
state = State.RUNNING;
48+
state = RUNNING;
4749
}
4850

4951
final long[] midStateLow = new long[CURL_STATE_LENGTH];
@@ -70,11 +72,11 @@ public synchronized boolean search(final byte[] transactionTrits, final int minW
7072
worker.join();
7173
} catch (InterruptedException e) {
7274
synchronized (syncObj) {
73-
state = State.CANCELLED;
75+
state = CANCELLED;
7476
}
7577
}
7678
}
77-
return state == State.COMPLETED;
79+
return state == COMPLETED;
7880
}
7981

8082
private Runnable getRunnable(final int threadIndex, final byte[] transactionTrits, final int minWeightMagnitude,
@@ -93,7 +95,7 @@ private Runnable getRunnable(final int threadIndex, final byte[] transactionTrit
9395

9496
final int maskStartIndex = CURL_HASH_LENGTH - minWeightMagnitude;
9597
long mask = 0;
96-
while (state == State.RUNNING && mask == 0) {
98+
while (state == RUNNING && mask == 0) {
9799

98100
increment(midStateCopyLow, midStateCopyHigh, 162 + (CURL_HASH_LENGTH / 9) * 2,
99101
CURL_HASH_LENGTH);
@@ -108,8 +110,8 @@ private Runnable getRunnable(final int threadIndex, final byte[] transactionTrit
108110
}
109111
if (mask != 0) {
110112
synchronized (syncObj) {
111-
if (state == State.RUNNING) {
112-
state = State.COMPLETED;
113+
if (state == RUNNING) {
114+
state = COMPLETED;
113115
long outMask = 1;
114116
while ((outMask & mask) == 0) {
115117
outMask <<= 1;

src/main/java/com/iota/iri/crypto/Sponge.java renamed to src/main/java/com/iota/iri/hash/Sponge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

33
public interface Sponge {
44
int HASH_LENGTH = 243;

src/main/java/com/iota/iri/crypto/SpongeFactory.java renamed to src/main/java/com/iota/iri/hash/SpongeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iota.iri.crypto;
1+
package com.iota.iri.hash;
22

33
/**
44
* Created by paul on 7/27/17.

‎src/main/java/com/iota/iri/model/AbstractHash.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Arrays;
55
import java.util.Objects;
66

7-
import com.iota.iri.crypto.Curl;
7+
import com.iota.iri.hash.Curl;
88
import com.iota.iri.model.persistables.Transaction;
99
import com.iota.iri.model.safe.ByteSafe;
1010
import com.iota.iri.model.safe.TritSafe;

‎src/main/java/com/iota/iri/model/Hash.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.iota.iri.model;
22

3-
import com.iota.iri.crypto.Curl;
3+
import com.iota.iri.hash.Curl;
44
import com.iota.iri.storage.Indexable;
55

66
public interface Hash extends Indexable, HashId {

0 commit comments

Comments
 (0)