Skip to content

Commit 861fcb2

Browse files
tchardingtcharding
committed
Merge #358: Update verify to check for model vs no model
42fc2c4 Update verify to check for model vs no model (Jamil Lambert, PhD) 7faee78 Fix verify and types tags for model or not (Jamil Lambert, PhD) Pull request description: Verify does not correctly check that the RPCs state if they are modelled or not consistently between `verify` and the `types` table. Which meant that a lot are different between the two. - Go through all of them and make them both match what is done for that RPC. - Update `verify` to check that modelled vs no model matches. Closes #144 ACKs for top commit: tcharding: ACK 42fc2c4 Tree-SHA512: bce257b9a82d17c915527e2518debe5824d214f4601c48746bcf890f0ae37f3add71cd59b2660d30a4ea8d0759ca297211edd847c6fbad09ec15ccc71f93f2a1
2 parents 44692b5 + 42fc2c4 commit 861fcb2

File tree

27 files changed

+290
-203
lines changed

27 files changed

+290
-203
lines changed

‎types/src/v17/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
//! | bumpfee | version + model | |
158158
//! | createwallet | version + model | |
159159
//! | dumpprivkey | version + model | |
160-
//! | dumpwallet | version + model | |
160+
//! | dumpwallet | version | |
161161
//! | encryptwallet | version | |
162162
//! | getaccount | returns nothing | |
163163
//! | getaccountaddress | returns nothing | |

‎types/src/v18/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
//! | JSON-RPC Method Name | Returns | Notes |
6060
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6161
//! | getmemoryinfo | version | |
62-
//! | getrpcinfo | version + model | |
62+
//! | getrpcinfo | version | |
6363
//! | help | returns string | |
6464
//! | logging | version | |
6565
//! | stop | returns string | |
@@ -164,7 +164,7 @@
164164
//! | bumpfee | version + model | |
165165
//! | createwallet | version + model | |
166166
//! | dumpprivkey | version + model | |
167-
//! | dumpwallet | version + model | |
167+
//! | dumpwallet | version | |
168168
//! | encryptwallet | version | |
169169
//! | getaddressesbylabel | version + model | |
170170
//! | getaddressinfo | version + model | |

‎types/src/v19/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockhash | version + model | |
3535
//! | getblockheader | version + model | Includes additional 'verbose' type |
3636
//! | getblockstats | version + model | |
@@ -60,7 +60,7 @@
6060
//! | JSON-RPC Method Name | Returns | Notes |
6161
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6262
//! | getmemoryinfo | version | |
63-
//! | getrpcinfo | version + model | |
63+
//! | getrpcinfo | version | |
6464
//! | help | returns string | |
6565
//! | logging | version | |
6666
//! | stop | returns string | |
@@ -164,7 +164,7 @@
164164
//! | bumpfee | version + model | |
165165
//! | createwallet | version + model | |
166166
//! | dumpprivkey | version + model | |
167-
//! | dumpwallet | version + model | |
167+
//! | dumpwallet | version | |
168168
//! | encryptwallet | version | |
169169
//! | getaddressesbylabel | version + model | |
170170
//! | getaddressinfo | version + model | |

‎types/src/v20/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockhash | version + model | |
3535
//! | getblockheader | version + model | Includes additional 'verbose' type |
3636
//! | getblockstats | version + model | |
@@ -60,7 +60,7 @@
6060
//! | JSON-RPC Method Name | Returns | Notes |
6161
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6262
//! | getmemoryinfo | version | |
63-
//! | getrpcinfo | version + model | |
63+
//! | getrpcinfo | version | |
6464
//! | help | returns string | |
6565
//! | logging | version | |
6666
//! | stop | returns string | |
@@ -165,7 +165,7 @@
165165
//! | bumpfee | version + model | |
166166
//! | createwallet | version + model | |
167167
//! | dumpprivkey | version + model | |
168-
//! | dumpwallet | version + model | |
168+
//! | dumpwallet | version | |
169169
//! | encryptwallet | version | |
170170
//! | getaddressesbylabel | version + model | |
171171
//! | getaddressinfo | version + model | |

‎types/src/v21/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockhash | version + model | |
3535
//! | getblockheader | version + model | Includes additional 'verbose' type |
3636
//! | getblockstats | version + model | |
@@ -60,7 +60,7 @@
6060
//! | JSON-RPC Method Name | Returns | Notes |
6161
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6262
//! | getmemoryinfo | version | |
63-
//! | getrpcinfo | version + model | |
63+
//! | getrpcinfo | version | |
6464
//! | help | returns string | |
6565
//! | logging | version | |
6666
//! | stop | returns string | |
@@ -167,7 +167,7 @@
167167
//! | bumpfee | version + model | |
168168
//! | createwallet | version + model | |
169169
//! | dumpprivkey | version + model | |
170-
//! | dumpwallet | version + model | |
170+
//! | dumpwallet | version | |
171171
//! | encryptwallet | version | |
172172
//! | getaddressesbylabel | version + model | |
173173
//! | getaddressinfo | version + model | |

‎types/src/v22/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockhash | version + model | |
3535
//! | getblockheader | version + model | Includes additional 'verbose' type |
3636
//! | getblockstats | version + model | |
@@ -60,7 +60,7 @@
6060
//! | JSON-RPC Method Name | Returns | Notes |
6161
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6262
//! | getmemoryinfo | version | |
63-
//! | getrpcinfo | version + model | |
63+
//! | getrpcinfo | version | |
6464
//! | help | returns string | |
6565
//! | logging | version | |
6666
//! | stop | returns string | |
@@ -176,7 +176,7 @@
176176
//! | bumpfee | version + model | |
177177
//! | createwallet | version + model | |
178178
//! | dumpprivkey | version + model | |
179-
//! | dumpwallet | version + model | |
179+
//! | dumpwallet | version | |
180180
//! | encryptwallet | version | |
181181
//! | getaddressesbylabel | version + model | |
182182
//! | getaddressinfo | version + model | |

‎types/src/v23/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockfrompeer | returns nothing | |
3535
//! | getblockhash | version + model | |
3636
//! | getblockheader | version + model | Includes additional 'verbose' type |
@@ -62,7 +62,7 @@
6262
//! | JSON-RPC Method Name | Returns | Notes |
6363
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6464
//! | getmemoryinfo | version | |
65-
//! | getrpcinfo | version + model | |
65+
//! | getrpcinfo | version | |
6666
//! | help | returns string | |
6767
//! | logging | version | |
6868
//! | stop | returns string | |
@@ -167,7 +167,7 @@
167167
//! | bumpfee | version + model | |
168168
//! | createwallet | version + model | |
169169
//! | dumpprivkey | version + model | |
170-
//! | dumpwallet | version + model | |
170+
//! | dumpwallet | version | |
171171
//! | encryptwallet | version | |
172172
//! | getaddressesbylabel | version + model | |
173173
//! | getaddressinfo | version + model | |

‎types/src/v24/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockfrompeer | returns nothing | |
3535
//! | getblockhash | version + model | |
3636
//! | getblockheader | version + model | Includes additional 'verbose' type |
@@ -63,7 +63,7 @@
6363
//! | JSON-RPC Method Name | Returns | Notes |
6464
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6565
//! | getmemoryinfo | version | |
66-
//! | getrpcinfo | version + model | |
66+
//! | getrpcinfo | version | |
6767
//! | help | returns string | |
6868
//! | logging | version | |
6969
//! | stop | returns string | |
@@ -168,7 +168,7 @@
168168
//! | bumpfee | version + model | |
169169
//! | createwallet | version + model | |
170170
//! | dumpprivkey | version + model | |
171-
//! | dumpwallet | version + model | |
171+
//! | dumpwallet | version | |
172172
//! | encryptwallet | version | |
173173
//! | getaddressesbylabel | version + model | |
174174
//! | getaddressinfo | version + model | |

‎types/src/v25/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//! | getblock | version + model | Includes additional 'verbose' type |
3131
//! | getblockchaininfo | version + model | |
3232
//! | getblockcount | version + model | |
33-
//! | getblockfilter | version | |
33+
//! | getblockfilter | version + model | |
3434
//! | getblockfrompeer | returns nothing | |
3535
//! | getblockhash | version + model | |
3636
//! | getblockheader | version + model | Includes additional 'verbose' type |
@@ -64,7 +64,7 @@
6464
//! | JSON-RPC Method Name | Returns | Notes |
6565
//! |:-----------------------------------|:---------------:|:--------------------------------------:|
6666
//! | getmemoryinfo | version | |
67-
//! | getrpcinfo | version + model | |
67+
//! | getrpcinfo | version | |
6868
//! | help | returns string | |
6969
//! | logging | version | |
7070
//! | stop | returns string | |
@@ -169,7 +169,7 @@
169169
//! | bumpfee | version + model | |
170170
//! | createwallet | version + model | |
171171
//! | dumpprivkey | version + model | |
172-
//! | dumpwallet | version + model | |
172+
//! | dumpwallet | version | |
173173
//! | encryptwallet | version | |
174174
//! | getaddressesbylabel | version + model | |
175175
//! | getaddressinfo | version + model | |

0 commit comments

Comments
 (0)