Skip to content

Conversation

@kallewoof
Copy link
Contributor

@kallewoof kallewoof commented Jan 5, 2017

This is a sub-set of #9235, including only the rpc and script dirs.

Same-binaries check (2017-03-08):

$ ../bitcoin-maintainer-tools/build-for-compare.py 6996e066b538f03b8aa1f617dbb959b57ff6e727 8cbfc4e47216cbf9e3e758604e23951f40d76cf9 --executables "src/bitcoind,src/bitcoin-cli,src/bitcoin-tx"
[...]
make[1]: Leaving directory '/tmp/repo/src'
>>> [do_build] Copying object files...
>>> [do_build] Performing basic analysis pass...
>>> [do_build] Use these commands to compare results:
>>> [do_build] $ sha256sum /tmp/compare/*.stripped
>>> [do_build] $ git diff -W --word-diff /tmp/compare/6996e066b538f03b8aa1f617dbb959b57ff6e727 /tmp/compare/8cbfc4e47216cbf9e3e758604e23951f40d76cf9
$ sha256sum /tmp/compare/*.stripped
1bfe4311525db52b9c5d5c2b0b9ff6f8e3f3cfda0dcb1e5cd83b08b767a4a902  /tmp/compare/bitcoin-cli.6996e066b538f03b8aa1f617dbb959b57ff6e727.stripped
1bfe4311525db52b9c5d5c2b0b9ff6f8e3f3cfda0dcb1e5cd83b08b767a4a902  /tmp/compare/bitcoin-cli.8cbfc4e47216cbf9e3e758604e23951f40d76cf9.stripped
fb0f6796776dc39e422910572a216cbad87f607cbb4920bd12d2c483cc51e231  /tmp/compare/bitcoind.6996e066b538f03b8aa1f617dbb959b57ff6e727.stripped
fb0f6796776dc39e422910572a216cbad87f607cbb4920bd12d2c483cc51e231  /tmp/compare/bitcoind.8cbfc4e47216cbf9e3e758604e23951f40d76cf9.stripped
fe4107fcc49ba17cdfbb0edc357373ea37d833d5691af7b2367758e8b3e1d45c  /tmp/compare/bitcoin-tx.6996e066b538f03b8aa1f617dbb959b57ff6e727.stripped
fe4107fcc49ba17cdfbb0edc357373ea37d833d5691af7b2367758e8b3e1d45c  /tmp/compare/bitcoin-tx.8cbfc4e47216cbf9e3e758604e23951f40d76cf9.stripped
$ git diff -W --word-diff /tmp/compare/6996e066b538f03b8aa1f617dbb959b57ff6e727 /tmp/compare/8cbfc4e47216cbf9e3e758604e23951f40d76cf9
$ 

The affected files and namespaces:

rpc/blockchain.cpp:       std
rpc/client.cpp:           std
rpc/mining.cpp:           std
rpc/misc.cpp:             std
rpc/net.cpp:              std
rpc/protocol.cpp:         std
rpc/rawtransaction.cpp:   std
rpc/server.cpp:           RPCServer [unused], std
script/interpreter.cpp:   std
script/ismine.cpp:        std
script/script.cpp:        std
script/sign.cpp:          std
script/standard.cpp:      std

@maflcko
Copy link
Member

maflcko commented Jan 5, 2017

This might conflict with pending rpc and multiwallet changes, which are planned for 0.14.

Imo, we should wait until feature freeze in two weeks and then do the same-binary check on this pull and merge into 0.14 if it passes.

@kallewoof
Copy link
Contributor Author

@MarcoFalke OK.

@kallewoof kallewoof changed the title Refactor: Remove using namespace <xxx> from rpc/ & script/ sources [refactor] Remove using namespace <xxx> from rpc/ & script/ sources Jan 13, 2017
@kallewoof kallewoof force-pushed the no-using-namespace-rpc-script branch 2 times, most recently from 0ae5238 to 6947651 Compare January 18, 2017 03:26
@fanquake
Copy link
Member

Feature freeze is here. Please rebase this.

@kallewoof kallewoof force-pushed the no-using-namespace-rpc-script branch from 6947651 to 1eb9d53 Compare January 23, 2017 01:38
@kallewoof
Copy link
Contributor Author

@fanquake Rebased & redid binary comparison (ff58b1c vs 1eb9d53).

@jtimon
Copy link
Contributor

jtimon commented Feb 24, 2017

utACK 1eb9d53

@maflcko
Copy link
Member

maflcko commented Feb 24, 2017

utACK 1eb9d53

@sipa
Copy link
Member

sipa commented Feb 24, 2017

utACK

@laanwj laanwj self-assigned this Mar 8, 2017
@laanwj
Copy link
Member

laanwj commented Mar 8, 2017

Needs another rebase, sorry.

@kallewoof kallewoof force-pushed the no-using-namespace-rpc-script branch from 1eb9d53 to 8cbfc4e Compare March 8, 2017 16:26
@kallewoof
Copy link
Contributor Author

@laanwj Rebased & redid binary comparison (6996e06 vs 8cbfc4e).

@kallewoof kallewoof force-pushed the no-using-namespace-rpc-script branch from cd5971c to 8cbfc4e Compare March 8, 2017 23:43
@kallewoof
Copy link
Contributor Author

kallewoof commented Mar 9, 2017

I'm not sure why Travis is failing. Edit: It stopped failing.

@kallewoof kallewoof force-pushed the no-using-namespace-rpc-script branch from 8d51012 to 8cbfc4e Compare March 9, 2017 00:40
@laanwj laanwj merged commit 8cbfc4e into bitcoin:master Mar 9, 2017
laanwj added a commit that referenced this pull request Mar 9, 2017
…pt/ sources

8cbfc4e Refactor: Remove using namespace <xxx> from script/ (Karl-Johan Alm)
f3c264e Refactor: Remove using namespace <xxx> from rpc/ (Karl-Johan Alm)

Tree-SHA512: 407e80eeda0b8e1df22c5fcba33572e117542fde83c67357f6c2d98fa60bcc7b21bb88ad9a1ee59062fbec17fadaa4836b69e8e6d18188b4027b794357634467
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Feb 21, 2018
… & script/ sources

8cbfc4e Refactor: Remove using namespace <xxx> from script/ (Karl-Johan Alm)
f3c264e Refactor: Remove using namespace <xxx> from rpc/ (Karl-Johan Alm)

Tree-SHA512: 407e80eeda0b8e1df22c5fcba33572e117542fde83c67357f6c2d98fa60bcc7b21bb88ad9a1ee59062fbec17fadaa4836b69e8e6d18188b4027b794357634467
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
… & script/ sources

8cbfc4e Refactor: Remove using namespace <xxx> from script/ (Karl-Johan Alm)
f3c264e Refactor: Remove using namespace <xxx> from rpc/ (Karl-Johan Alm)

Tree-SHA512: 407e80eeda0b8e1df22c5fcba33572e117542fde83c67357f6c2d98fa60bcc7b21bb88ad9a1ee59062fbec17fadaa4836b69e8e6d18188b4027b794357634467
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 28, 2019
@kallewoof kallewoof deleted the no-using-namespace-rpc-script branch October 17, 2019 08:48
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants