[Move Only] Move wallet related sources to src/wallet/ #5745
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
You forgot to git add the new directory, it looks like. |
jonasschnelli
force-pushed
the
2015/02/legacywallet_modularization
branch
from
dd95b20 to
56e7e6b
Compare
Contributor
Author
|
@TheBlueMatt Bah. Now added. Thanks. |
jonasschnelli
force-pushed
the
2015/02/legacywallet_modularization
branch
2 times, most recently
from
1a94305 to
b20f2a6
Compare
Member
|
ACK (but needs rebase) |
jonasschnelli
force-pushed
the
2015/02/legacywallet_modularization
branch
2 times, most recently
from
70cd06e to
c708012
Compare
Contributor
Author
|
Rebased. |
jonasschnelli
added a commit
to jonasschnelli/bitcoin
that referenced
this pull request
Feb 4, 2015
According to bitcoin#3440 it would make sense to decouple the wallet and the miner (and maybe other things) from the init-/shutdown-process, etc. This is related to bitcoin#5686, bitcoin#5744, bitcoin#5745
Member
|
Since there's a reasonably clean separation of the wallet files, I'd prefer to build the objects in the subdir, same as qt and tests: diff --git a/src/Makefile.am b/src/Makefile.am
index 88e7af2..1ff3180 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPP
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
LIBBITCOIN_SERVER=libbitcoin_server.a
-LIBBITCOIN_WALLET=libbitcoin_wallet.a
+LIBBITCOIN_WALLET=wallet/libbitcoin_wallet.a
LIBBITCOIN_COMMON=libbitcoin_common.a
LIBBITCOIN_CLI=libbitcoin_cli.a
LIBBITCOIN_UTIL=libbitcoin_util.a
@@ -46,7 +46,7 @@ EXTRA_LIBRARIES = \
libbitcoin_cli.a
if ENABLE_WALLET
BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
-EXTRA_LIBRARIES += libbitcoin_wallet.a
+EXTRA_LIBRARIES += $(LIBBITCOIN_WALLET)
endif
if BUILD_BITCOIN_LIBS
@@ -191,8 +191,8 @@ libbitcoin_server_a_SOURCES = \
# wallet: shared between bitcoind and bitcoin-qt, but only linked
# when wallet enabled
-libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
-libbitcoin_wallet_a_SOURCES = \
+wallet_libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
+wallet_libbitcoin_wallet_a_SOURCES = \
wallet/db.cpp \
crypter.cpp \
wallet/rpcdump.cpp \
@@ -310,7 +310,7 @@ bitcoind_LDADD = \
$(LIBSECP256K1)
if ENABLE_WALLET
-bitcoind_LDADD += libbitcoin_wallet.a
+bitcoind_LDADD += $(LIBBITCOIN_WALLET)
endif
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 31fe3a9..7b48b41 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -370,7 +370,7 @@ QT_QM=$(QT_TS:.ts=.qm)
SECONDARY: $(QT_QM)
-qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
+qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(wallet_libbitcoin_wallet_a_SOURCES)
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) ../share/qt/extract_strings_qt.py $^
That'd be my preference since imo it's cleaner, but I'm not strongly opposed to leaving it as-is. ACK either way. |
Contributor
Author
|
@theuni Yes. I think this should be the long term goal. Let me play with it. |
Member
|
@jonasschnelli sure, no problem if things slowly move that way, no need to try to do it all at once. Yes, tests are fine as you handled them imo. Eventually we can create a Makefile.wallet.include once it's more decoupled. |
Contributor
|
ut ACK |
jonasschnelli
force-pushed
the
2015/02/legacywallet_modularization
branch
from
c708012 to
aa9ea5f
Compare
Contributor
Author
|
Rebased. What if we merge this (has ACK from @theuni and @laanwj)? This requires rebase often when getting out of date. |
Contributor
|
utACK |
1 similar comment
Member
|
utACK |
could once be renamed from /src/wallet to /src/legacywallet.
jonasschnelli
force-pushed
the
2015/02/legacywallet_modularization
branch
from
aa9ea5f to
50c72f2
Compare
Contributor
Author
|
Rebased and ready for merge. :) |
laanwj
added a commit
that referenced
this pull request
Mar 20, 2015
50c72f2 [Move Only] Move wallet related things to src/wallet/ (Jonas Schnelli)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This looks after a heavy changeset, but it's not. This will only move wallet related files to
/src/wallet/.The PR includes no code changes.
Could once be renamed from
/src/walletto/src/legacywallet.