MOVE ONLY: move rpc* to rpc/ #7348

pull dcousens wants to merge 2 commits into bitcoin:master from dcousens:master changing 25 files +80 −82

dcousens commented at 1:45 AM on January 15, 2016: contributor

Was just playing around with the RPC, and found the constant prefixing of file names frustrating.

This also seems to be in line with the way other modules (zmq etc) have been grouped.

Should be easy to review.

Note: This won't negatively impact git blame
MarcoFalke commented at 7:13 AM on January 15, 2016: member

What's up with src/wallet/rpc*?
in src/rpc/server.h:None in f90cfbca4c outdated
```
 197 | @@ -198,7 +198,7 @@ extern UniValue estimatepriority(const UniValue& params, bool fHelp);
 198 |  extern UniValue estimatesmartfee(const UniValue& params, bool fHelp);
 199 |  extern UniValue estimatesmartpriority(const UniValue& params, bool fHelp);
 200 |  
 201 | -extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 202 | +extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpc/wallet.cpp
```
MarcoFalke commented at 7:15 AM on January 15, 2016:

There is no rpc/wallet.cpp?!

dcousens commented at 11:49 AM on January 15, 2016:

Indeed. I wonder what the best course of action is here? I'll probably just change that to wallet/rpcwallet.cpp

jonasschnelli commented at 11:50 AM on January 15, 2016:

#7307 would solve that. But I agree, changing to wallet/rpcwallet.cpp is probably fine for this PR.

laanwj commented at 9:20 AM on January 16, 2016:

Yes, my suggested fix too would b to just fix the comment
jonasschnelli added the label Refactoring on Jan 15, 2016
jonasschnelli added the label RPC on Jan 15, 2016
jonasschnelli commented at 9:17 AM on January 15, 2016: contributor

Nice! Concept ACK.
laanwj commented at 9:20 AM on January 16, 2016: member

Concept ACK.

Not that you moved it, but for completeness' sake: please leave rpcwallet.cpp in src/wallet. e.g. it is the RPC interface to the wallet. This, imo, logically belongs to the wallet: if there was a different wallet it could have a different RPC interface.
dcousens commented at 2:12 AM on January 17, 2016: contributor

@laanwj amended inline comment commit. Should be good to go.

This, imo, logically belongs to the wallet: if there was a different wallet it could have a different RPC interface.

Agreed.
MarcoFalke commented at 9:31 AM on January 17, 2016: member

@dcousens Could you make the commits atomic, so that each of them compiles?
dcousens commented at 10:02 AM on January 17, 2016: contributor

@MarcoFalke rebased and fixed a bad path in /src/qt/ (I don't typically build with Qt). Commits were already atomic.

Waiting on travis.
MarcoFalke commented at 10:51 AM on January 17, 2016: member

Concept ACK 611508c
laanwj commented at 2:46 PM on January 20, 2016: member

Needs rebase after #7307
move rpc* to rpc/ a0eaff8a1d
rpc: update inline comments to refer to new file paths d13f65ebac
dcousens commented at 9:43 PM on January 20, 2016: contributor

Rebased
MarcoFalke commented at 10:05 PM on January 20, 2016: member

utACK d13f65ebac13ec18b7eb55176c31f1404f185c0c
paveljanik commented at 1:29 PM on January 23, 2016: contributor

ACK https://github.com/dcousens/bitcoin/commit/d13f65ebac13ec18b7eb55176c31f1404f185c0c

Header guards do not match now (_ missing), but not that important.
jonasschnelli commented at 1:30 PM on January 23, 2016: contributor

utACK d13f65ebac13ec18b7eb55176c31f1404f185c0c. Confirm move only.
laanwj merged this on Jan 28, 2016
laanwj closed this on Jan 28, 2016
laanwj referenced this in commit 62f2d769e4 on Jan 28, 2016
jtimon commented at 4:02 PM on January 28, 2016: contributor

nice
zkbot referenced this in commit 52f4abccef on Jun 20, 2018
zkbot referenced this in commit ec246b2ec1 on Jul 3, 2018
zkbot referenced this in commit b8e82e77af on Jul 16, 2018
zkbot referenced this in commit 5978dfecb5 on Jul 18, 2018
zkbot referenced this in commit cd0484e023 on Jul 18, 2018
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Refactoring RPC/REST/ZMQ