Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
removed unused imports
  • Loading branch information
dbasch committed Jan 19, 2014
1 parent 305e2f3 commit 2f51b17
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 5 additions & 4 deletions src/main/java/com/fruitcat/bitcoin/BIP38.java
Expand Up @@ -115,7 +115,7 @@ public static GeneratedKey encryptedKeyFromIntermediate(byte[] intermediate) thr
} }


/** /**
* Generates a confirmation code for the party that requested the key with an intermediate passphrase. * Generates a confirmation code for the party that requested the address with an intermediate passphrase.
* @param flagByte * @param flagByte
* @param addressHash * @param addressHash
* @param ownerEntropy * @param ownerEntropy
Expand Down Expand Up @@ -145,7 +145,8 @@ private static String confirm(byte flagByte, byte[] addressHash, byte [] ownerEn
} }


/** /**
* Verifies a generated key. * Verifies a generated key. TO DO: verify with just the confirmation code,
* so we don't have to decrypt the key to recalculate the address.
* @param passphrase * @param passphrase
* @param generatedKey * @param generatedKey
* @return * @return
Expand Down Expand Up @@ -397,8 +398,8 @@ else if (args[0].equals("-d")) {
} }


private static void usage() { private static void usage() {
System.out.println("Usage: BIP38 [-d|-e] [passphrase] [key]\nEncrypts or decrypts a key."); System.out.println("Usage: BIP38 [-d|-e] [passphrase] [key] - Encrypts or decrypts a key.");
System.out.println(" BIP38 [passphrase]\nGenerates a key encrypted with the passphrase."); System.out.println(" BIP38 [passphrase] - Generates a key encrypted with the passphrase.");


} }
} }
4 changes: 1 addition & 3 deletions src/test/java/com/fruitcat/bitcoin/BIP38Test.java
@@ -1,8 +1,6 @@
package com.fruitcat.bitcoin; package com.fruitcat.bitcoin;


import com.google.bitcoin.core.Base58; import com.google.bitcoin.core.Base58;
import com.google.bitcoin.core.DumpedPrivateKey;
import com.google.bitcoin.params.MainNetParams;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;


Expand Down Expand Up @@ -62,4 +60,4 @@ public void checkConfirmation() throws Exception {
assert(BIP38.verify(testPass, gk)); assert(BIP38.verify(testPass, gk));
assert(!BIP38.verify("garbage", gk)); assert(!BIP38.verify("garbage", gk));
} }
} }

0 comments on commit 2f51b17

Please sign in to comment.