Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-24 07:30:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove walletprefix, fix key event listener, v 0.3.2.23-snapshot

Browse source
This commit is contained in:
Manfred Karrer 2015-12-29 00:36:19 +01:00
parent 4ef1a5e567
commit c2dbd55e77
20 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.2.2</version>
<version>0.3.2.3-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>

1
core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
View file

@ -187,7 +187,6 @@ public class BitsquareEnvironment extends StandardEnvironment {
setProperty(UserAgent.VERSION_KEY, Version.VERSION);
setProperty(WalletService.DIR_KEY, btcNetworkDir);
setProperty(WalletService.PREFIX_KEY, appName);
setProperty(Storage.DIR_KEY, Paths.get(btcNetworkDir, "db").toString());
setProperty(KeyStorage.DIR_KEY, Paths.get(btcNetworkDir, "keys").toString());

1
core/src/main/java/io/bitsquare/btc/BitcoinModule.java
View file

@ -45,7 +45,6 @@ public class BitcoinModule extends AppModule {
File walletDir = new File(env.getRequiredProperty(WalletService.DIR_KEY));
bind(File.class).annotatedWith(named(WalletService.DIR_KEY)).toInstance(walletDir);
bindConstant().annotatedWith(named(WalletService.PREFIX_KEY)).to(env.getRequiredProperty(WalletService.PREFIX_KEY));
bind(AddressEntryList.class).in(Singleton.class);
bind(TradeWalletService.class).in(Singleton.class);

6
core/src/main/java/io/bitsquare/btc/WalletService.java
View file

@ -83,7 +83,6 @@ public class WalletService {
private final AddressEntryList addressEntryList;
private final NetworkParameters params;
private final File walletDir;
private final String walletPrefix;
private final UserAgent userAgent;
private WalletAppKit walletAppKit;
@ -99,7 +98,7 @@ public class WalletService {
@Inject
public WalletService(RegTestHost regTestHost, TradeWalletService tradeWalletService, AddressEntryList addressEntryList, UserAgent userAgent,
@Named(DIR_KEY) File walletDir, @Named(PREFIX_KEY) String walletPrefix, Preferences preferences) {
@Named(DIR_KEY) File walletDir, Preferences preferences) {
this.regTestHost = regTestHost;
this.tradeWalletService = tradeWalletService;
this.addressEntryList = addressEntryList;
@ -110,7 +109,6 @@ public class WalletService {
"Mainnet is not allowed to be used at that stage of development");
this.walletDir = new File(walletDir, "bitcoin");
this.walletPrefix = walletPrefix;
this.userAgent = userAgent;
}
@ -136,7 +134,7 @@ public class WalletService {
);
// If seed is non-null it means we are restoring from backup.
walletAppKit = new WalletAppKit(params, walletDir, walletPrefix) {
walletAppKit = new WalletAppKit(params, walletDir, "Bitsquare") {
@Override
protected void onSetupCompleted() {
// Don't make the user wait for confirmations for now, as the intention is they're sending it