Conversion to Maven, Tests adjusted to help developers

- As per mrosseel's pom file, conversion of all dependencies to use maven2. This will ease the pain of managing a bunch of jar files in lib
- Repaired some deprecation warnings in bitcoinj dependency around Sha256 creation and ECKey construction.
- Adjusted test harness to create tokens for pos/merchant facade, this is done once the first time someone runs the tests. The test runner just has to pair with their test account. The tester is does not have cascading test failures that might confuses as to what he/she needs to do.
- Added some notes about how to do the refund test.

Author: Chris Kleeschulte

src/main/java/controller/BitPay.java

@@ -21,12 +21,14 @@
 import org.apache.http.util.EntityUtils;
 import org.bitcoinj.core.ECKey;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.bitcoinj.core.ECKey;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
 
 public class BitPay {
 

src/main/java/controller/KeyUtils.java

@@ -7,16 +7,8 @@
 
 import java.io.*;
 import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.security.SecureRandom;
 
-import org.bitcoinj.core.Base58;
-import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.ECKey.ECDSASignature;
-import org.bitcoinj.core.Sha256Hash;
-import org.bitcoinj.core.Utils;
-
 public class KeyUtils {
 
     final private static char[] hexArray = "0123456789abcdef".toCharArray();
@@ -29,16 +21,20 @@ public static boolean privateKeyExists()
         return new File(PRIV_KEY_FILENAME).exists();
     }
 
-    public static ECKey createEcKey() {
+    public static ECKey createEcKey()
+    {
         //Default constructor uses SecureRandom numbers.
         return new ECKey();
     }
 
-    public static ECKey createEcKeyFromHexString(String privateKey) {
+    public static ECKey createEcKeyFromHexString(String privateKey)
+    {
         //if you are going to choose this option, please ensure this string is as random as
         //possible, consider http://world.std.com/~reinhold/diceware.html
         SecureRandom randomSeed = new SecureRandom(privateKey.getBytes());
-        return new ECKey(randomSeed);
+        ECKey key = new ECKey(randomSeed);
+
+        return key;
     }
 
     /**
@@ -48,9 +44,10 @@ public static ECKey createEcKeyFromHexStringFile(String privKeyFile) throws IOEx
         return createEcKeyFromHexString(getKeyStringFromFile(privKeyFile));
     }
 
-    public static ECKey loadEcKey() throws IOException {
-        FileInputStream fileInputStream;
-        File file;
+    public static ECKey loadEcKey() throws IOException
+    {
+        FileInputStream fileInputStream = null;
+        File file = new File(PRIV_KEY_FILENAME);
 
         if (KeyUtils.privateKey == null) {
             file = new File(PRIV_KEY_FILENAME);

src/test/java/test/BitPayTest.java

@@ -9,9 +9,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -27,33 +24,21 @@ public class BitPayTest {
 
     private static String clientName = "BitPay Java Library Tester";
     private static String pairingCode;
-    private static String refundInvoiceId = null;
-    private static URI myKeyFile;
+    private static String refundInvoiceId;
 
     @Before
-    public void setUp() throws BitPayException, IOException, URISyntaxException {
+    public void setUp() throws BitPayException {
         //ensure the second argument (api url) is the same as the one used in setUpOneTime()
-        bitpay = new BitPay(myKeyFile, clientName, BitPay.BITPAY_TEST_URL);
+        bitpay = new BitPay(clientName, BitPay.BITPAY_TEST_URL);
     }
 
 	@BeforeClass
-	public static void setUpOneTime() throws InterruptedException, IOException, BitPayException, URISyntaxException {
+	public static void setUpOneTime() throws Exception
+	{
         boolean dumpOut = false;
-
-        //create a key, if a file does exist at the uri, myKeyfile, a new key will be created in the construction of the client
-        //ECKey myKey = KeyUtils.createEcKey();
-
-
-        myKeyFile = new URI("file:///tmp/bitpay_private.key"); //if file exists, it will not overwrite
-
-        //save the somewhere that you can reuse it:
-        //this saves a EC key to compressed ASN.1 DER encoded format
-        //if you use your own key (not generated by our key utils), then ensure your key is in the above format
-        //KeyUtils.saveEcKey(myKey, myKeyFile);
-
         // This scenario qualifies that this (test) client does not have merchant facade access.
 		clientName += " on " + java.net.InetAddress.getLocalHost();
-		BitPay bitpay = new BitPay(myKeyFile, clientName, BitPay.BITPAY_TEST_URL);
+		BitPay bitpay = new BitPay(clientName, BitPay.BITPAY_TEST_URL);
 
 		// Authorize this client for use with a BitPay merchant account.  This client requires both
 		// POS and MERCHANT facades.
@@ -77,7 +62,7 @@ public static void setUpOneTime() throws InterruptedException, IOException, BitP
             System.out.println("Info: Client is requesting POS facade access. Pair this client with your merchant account using the pairing code: " + pairingCode);
             dumpOut = true;
             //we already failed to authorize for a POS token, therefore we must sleep a bit to try to authorize for any other facade (rate limiter on the api side)
-            Thread.sleep(10000);
+            Thread.sleep(3000);
         }
 
         if (!bitpay.clientIsAuthorized(BitPay.FACADE_MERCHANT))

src/test/java/test/BitPayTest2.java

@@ -7,7 +7,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.net.UnknownHostException;
+import static org.junit.Assert.assertNotNull;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -23,14 +23,14 @@ public void setUp() throws BitPayException {
     }
 
 	@BeforeClass
-	public static void setUpOneTime() throws UnknownHostException, BitPayException
+	public static void setUpOneTime() throws Exception
 	{
 		// If this test has never been run before then this test must be run twice in order to pass.
 		// The first time this test runs it will create an identity and emit a client pairing code.
 		// The pairing code must then be authorized in a BitPay account.  Running the test a second
 		// time should result in the authorized client (this test) running to completion.
 		clientName += " on " + java.net.InetAddress.getLocalHost();
-        BitPay bitpay = new BitPay(clientName, BitPay.BITPAY_TEST_URL); //this tests the old way of creating keys/clients
+        BitPay bitpay = new BitPay(clientName, BitPay.BITPAY_TEST_URL);
 
         if (!bitpay.clientIsAuthorized(BitPay.FACADE_POS))
         {
@@ -55,6 +55,8 @@ public void testShouldGetInvoiceId()
         } catch (BitPayException e) {
             e.printStackTrace();
         }
+        System.out.println(invoice.getId());
+        refundInvoiceId = invoice.getId();
         assertNotNull(invoice.getId());
     }
 }