Upgrade to BitcoinJ 0.12-SNAPSHOT

- Update imports to reflect BitcoinJ's repackaging, including:

   git grep -l 'import com.google.bitcoin' | \
   xargs perl -p -i -e 's/import com.google.bitcoin/import org.bitcoinj/'

   git grep -l 'com.google.bitcoin' | \
   xargs perl -p -i -e 's/com.google.bitcoin/org.bitcoinj/'

 - Replace use of BitcoinJ's CoinFormat, which has now been renamed to
   MonetaryFormat, using:

   git grep -l 'CoinFormat' | \
   xargs perl -p -i -e 's/CoinFormat/MonetaryFormat/g'

 - Fix calls to BitcoinJ's Script#correctlySpends, whose signature has
   changed from 0.11 => 0.12.

See #98
This commit is contained in:
Chris Beams 2014-10-02 15:30:17 +02:00
parent d20a9306ee
commit 041d8ec7a7
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
76 changed files with 227 additions and 226 deletions

View file

@ -41,10 +41,10 @@ import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import io.bitsquare.util.ConfigLoader;
import com.google.bitcoin.core.NetworkParameters;
import com.google.bitcoin.params.MainNetParams;
import com.google.bitcoin.params.RegTestParams;
import com.google.bitcoin.params.TestNet3Params;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.params.TestNet3Params;
import com.google.inject.AbstractModule;
import com.google.inject.Provider;