diff --git a/core/src/main/java/org/bitcoinj/core/AddressMessage.java b/core/src/main/java/org/bitcoinj/core/AddressMessage.java index 9ef09149..a3332687 100644 --- a/core/src/main/java/org/bitcoinj/core/AddressMessage.java +++ b/core/src/main/java/org/bitcoinj/core/AddressMessage.java @@ -126,6 +126,6 @@ public class AddressMessage extends Message { @Override public String toString() { - return "addr: " + Utils.join(addresses); + return "addr: " + Utils.SPACE_JOINER.join(addresses); } } diff --git a/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java b/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java index f13790d8..73208062 100644 --- a/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java +++ b/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java @@ -70,7 +70,7 @@ public class GetBlocksMessage extends Message { @Override public String toString() { - return "getblocks: " + Utils.join(locator); + return "getblocks: " + Utils.SPACE_JOINER.join(locator); } @Override diff --git a/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java b/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java index 2302c5ca..ec340317 100644 --- a/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java +++ b/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java @@ -37,7 +37,7 @@ public class GetHeadersMessage extends GetBlocksMessage { @Override public String toString() { - return "getheaders: " + Utils.join(locator); + return "getheaders: " + Utils.SPACE_JOINER.join(locator); } /** diff --git a/core/src/main/java/org/bitcoinj/core/Utils.java b/core/src/main/java/org/bitcoinj/core/Utils.java index 1a44bc5f..13e9399c 100644 --- a/core/src/main/java/org/bitcoinj/core/Utils.java +++ b/core/src/main/java/org/bitcoinj/core/Utils.java @@ -54,7 +54,7 @@ public class Utils { public static final String BITCOIN_SIGNED_MESSAGE_HEADER = "Bitcoin Signed Message:\n"; public static final byte[] BITCOIN_SIGNED_MESSAGE_HEADER_BYTES = BITCOIN_SIGNED_MESSAGE_HEADER.getBytes(Charsets.UTF_8); - private static final Joiner SPACE_JOINER = Joiner.on(" "); + public static final Joiner SPACE_JOINER = Joiner.on(" "); private static BlockingQueue mockSleepQueue; @@ -411,18 +411,6 @@ public class Utils { return iso8601.format(dateTime); } - /** - * Returns a string containing the string representation of the given items, - * delimited by a single space character. - * - * @param items the items to join - * @param the item type - * @return the joined space-delimited string - */ - public static String join(Iterable items) { - return SPACE_JOINER.join(items); - } - public static byte[] copyOf(byte[] in, int length) { byte[] out = new byte[length]; System.arraycopy(in, 0, out, 0, Math.min(length, in.length)); diff --git a/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java b/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java index ce6d5db3..8fc014d2 100644 --- a/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java +++ b/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java @@ -127,7 +127,7 @@ public class MnemonicCode { // used as a pseudo-random function. Desired length of the // derived key is 512 bits (= 64 bytes). // - String pass = Utils.join(words); + String pass = Utils.SPACE_JOINER.join(words); String salt = "mnemonic" + passphrase; final Stopwatch watch = Stopwatch.createStarted(); diff --git a/core/src/main/java/org/bitcoinj/script/Script.java b/core/src/main/java/org/bitcoinj/script/Script.java index 6adbeeff..6abd00aa 100644 --- a/core/src/main/java/org/bitcoinj/script/Script.java +++ b/core/src/main/java/org/bitcoinj/script/Script.java @@ -135,7 +135,7 @@ public class Script { */ @Override public String toString() { - return Utils.join(chunks); + return Utils.SPACE_JOINER.join(chunks); } /** Returns the serialized program as a newly created byte array. */ diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java index b484e5bb..11201dba 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java @@ -1319,7 +1319,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain { builder.append("Seed is encrypted\n"); } else if (includePrivateKeys) { final List words = seed.getMnemonicCode(); - builder.append("Seed as words: ").append(Utils.join(words)).append('\n'); + builder.append("Seed as words: ").append(Utils.SPACE_JOINER.join(words)).append('\n'); builder.append("Seed as hex: ").append(seed.toHexString()).append('\n'); } builder.append("Seed birthday: ").append(seed.getCreationTimeSeconds()).append(" [") diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java index b5dea84c..b0182315 100644 --- a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java +++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java @@ -134,7 +134,7 @@ public class DeterministicSeed implements EncryptableItem { public String toString() { return isEncrypted() ? "DeterministicSeed [encrypted]" - : "DeterministicSeed " + toHexString() + " " + Utils.join(mnemonicCode); + : "DeterministicSeed " + toHexString() + " " + Utils.SPACE_JOINER.join(mnemonicCode); } /** Returns the seed as hex or null if encrypted. */ @@ -188,7 +188,7 @@ public class DeterministicSeed implements EncryptableItem { } private byte[] getMnemonicAsBytes() { - return Utils.join(mnemonicCode).getBytes(Charsets.UTF_8); + return Utils.SPACE_JOINER.join(mnemonicCode).getBytes(Charsets.UTF_8); } public DeterministicSeed decrypt(KeyCrypter crypter, String passphrase, KeyParameter aesKey) { diff --git a/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java b/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java index 4757d0bf..210261c5 100644 --- a/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java +++ b/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java @@ -171,7 +171,7 @@ public class MnemonicCodeTest { byte[] entropy = mc.toEntropy(split(vecCode)); assertEquals(vecData, HEX.encode(entropy)); - assertEquals(vecCode, Utils.join(code)); + assertEquals(vecCode, Utils.SPACE_JOINER.join(code)); assertEquals(vecSeed, HEX.encode(seed)); } } diff --git a/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java b/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java index bfb2e483..66e5575c 100644 --- a/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java +++ b/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java @@ -41,6 +41,6 @@ public class BackupToMnemonicSeed { System.out.println("seed: " + seed.toString()); System.out.println("creation time: " + seed.getCreationTimeSeconds()); - System.out.println("mnemonicCode: " + Utils.join(seed.getMnemonicCode())); + System.out.println("mnemonicCode: " + Utils.SPACE_JOINER.join(seed.getMnemonicCode())); } } diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java index acfcd91d..3eb3e542 100644 --- a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java +++ b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java @@ -84,7 +84,7 @@ public class WalletSettingsController { // Set the mnemonic seed words. final List mnemonicCode = seed.getMnemonicCode(); checkNotNull(mnemonicCode); // Already checked for encryption. - String origWords = Utils.join(mnemonicCode); + String origWords = Utils.SPACE_JOINER.join(mnemonicCode); wordsArea.setText(origWords); // Validate words as they are being typed.