From 17875c97c9746c86305d7bfffbe69c97ea353395 Mon Sep 17 00:00:00 2001 From: Brannon King Date: Fri, 30 Aug 2019 09:28:43 -0600 Subject: [PATCH] in progress on making py tests run --- src/claimscriptop.h | 6 +-- src/lbry.h | 4 +- test/config.ini.in | 2 +- test/functional/feature_block.py | 6 +-- test/functional/feature_config_args.py | 4 +- test/functional/feature_dbcrash.py | 8 ++-- test/functional/feature_includeconf.py | 4 +- test/functional/feature_proxy.py | 14 +++---- test/functional/feature_reindex.py | 2 +- .../functional/feature_versionbits_warning.py | 2 +- test/functional/interface_http.py | 2 +- test/functional/interface_zmq.py | 4 +- test/functional/mempool_persist.py | 4 +- test/functional/p2p_compactblocks.py | 12 +++--- test/functional/p2p_leak.py | 2 +- test/functional/p2p_segwit.py | 4 +- test/functional/p2p_timeouts.py | 2 +- test/functional/rpc_bind.py | 2 +- test/functional/rpc_users.py | 6 +-- test/functional/test_framework/authproxy.py | 2 +- test/functional/test_framework/messages.py | 6 +-- .../test_framework/test_framework.py | 42 +++++++++---------- test/functional/test_framework/test_node.py | 42 +++++++++---------- test/functional/test_framework/util.py | 8 ++-- test/functional/test_runner.py | 10 ++--- test/functional/wallet_multiwallet.py | 2 +- test/functional/wallet_zapwallettxes.py | 2 +- test/lint/lint-includes.sh | 6 +++ test_cli.sh | 31 ++++++++++++++ 29 files changed, 139 insertions(+), 102 deletions(-) create mode 100755 test_cli.sh diff --git a/src/claimscriptop.h b/src/claimscriptop.h index dffd52d5d..ecbaf9ff9 100644 --- a/src/claimscriptop.h +++ b/src/claimscriptop.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef CLAIMSCRIPTOP_H -#define CLAIMSCRIPTOP_H +#ifndef BITCOIN_CLAIMSCRIPTOP_H +#define BITCOIN_CLAIMSCRIPTOP_H #include #include @@ -242,4 +242,4 @@ struct CUpdateCacheCallbacks */ void UpdateCache(const CTransaction& tx, CClaimTrieCache& trieCache, const CCoinsViewCache& view, int nHeight, const CUpdateCacheCallbacks& callbacks = {}); -#endif // CLAIMSCRIPTOP_H +#endif // BITCOIN_CLAIMSCRIPTOP_H diff --git a/src/lbry.h b/src/lbry.h index 601ccc4a3..fa8385775 100644 --- a/src/lbry.h +++ b/src/lbry.h @@ -1,5 +1,5 @@ -#ifndef LBRY_H -#define LBRY_H +#ifndef BITCOIN_LBRY_H +#define BITCOIN_LBRY_H #include #include diff --git a/test/config.ini.in b/test/config.ini.in index 060c553da..6653d4547 100644 --- a/test/config.ini.in +++ b/test/config.ini.in @@ -16,6 +16,6 @@ RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py # Which components are enabled. These are commented out by `configure` if they were disabled when running config. @ENABLE_WALLET_TRUE@ENABLE_WALLET=true @BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=true -@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=true +@BUILD_BITCOIND_TRUE@ENABLE_LBRYCRDD=true @ENABLE_FUZZ_TRUE@ENABLE_FUZZ=true @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index f18875510..1d93548e4 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -357,7 +357,7 @@ class FullBlockTest(BitcoinTestFramework): b26 = self.update_block(26, []) self.send_blocks([b26], success=False, reject_reason='bad-cb-length', reconnect=True) - # Extend the b26 chain to make sure bitcoind isn't accepting b26 + # Extend the b26 chain to make sure lbrycrdd isn't accepting b26 b27 = self.next_block(27, spend=out[7]) self.send_blocks([b27], False) @@ -369,7 +369,7 @@ class FullBlockTest(BitcoinTestFramework): b28 = self.update_block(28, []) self.send_blocks([b28], success=False, reject_reason='bad-cb-length', reconnect=True) - # Extend the b28 chain to make sure bitcoind isn't accepting b28 + # Extend the b28 chain to make sure lbrycrdd isn't accepting b28 b29 = self.next_block(29, spend=out[7]) self.send_blocks([b29], False) @@ -909,7 +909,7 @@ class FullBlockTest(BitcoinTestFramework): assert_equal(len(b64a.serialize()), MAX_BLOCK_BASE_SIZE + 8) self.send_blocks([b64a], success=False, reject_reason='non-canonical ReadCompactSize()') - # bitcoind doesn't disconnect us for sending a bloated block, but if we subsequently + # lbrycrdd doesn't disconnect us for sending a bloated block, but if we subsequently # resend the header message, it won't send us the getdata message again. Just # disconnect and reconnect and then call sync_blocks. # TODO: improve this test to be less dependent on P2P DOS behaviour. diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index e8a3d122c..2f40e4e27 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -21,7 +21,7 @@ class ConfArgsTest(BitcoinTestFramework): # Assume node is stopped inc_conf_file_path = os.path.join(self.nodes[0].datadir, 'include.conf') - with open(os.path.join(self.nodes[0].datadir, 'bitcoin.conf'), 'a', encoding='utf-8') as conf: + with open(os.path.join(self.nodes[0].datadir, 'lbrycrd.conf'), 'a', encoding='utf-8') as conf: conf.write('includeconf={}\n'.format(inc_conf_file_path)) self.nodes[0].assert_start_raises_init_error( @@ -104,7 +104,7 @@ class ConfArgsTest(BitcoinTestFramework): self.nodes[0].assert_start_raises_init_error(['-datadir=' + new_data_dir], 'Error: Specified data directory "' + new_data_dir + '" does not exist.') # Check that using non-existent datadir in conf file fails - conf_file = os.path.join(default_data_dir, "bitcoin.conf") + conf_file = os.path.join(default_data_dir, "lbrycrd.conf") # datadir needs to be set before [regtest] section conf_file_contents = open(conf_file, encoding='utf8').read() diff --git a/test/functional/feature_dbcrash.py b/test/functional/feature_dbcrash.py index cbfa548e1..0e07d1ab7 100755 --- a/test/functional/feature_dbcrash.py +++ b/test/functional/feature_dbcrash.py @@ -93,14 +93,14 @@ class ChainstateWriteCrashTest(BitcoinTestFramework): return utxo_hash except: # An exception here should mean the node is about to crash. - # If bitcoind exits, then try again. wait_for_node_exit() - # should raise an exception if bitcoind doesn't exit. + # If lbrycrdd exits, then try again. wait_for_node_exit() + # should raise an exception if lbrycrdd doesn't exit. self.wait_for_node_exit(node_index, timeout=10) self.crashed_on_restart += 1 time.sleep(1) - # If we got here, bitcoind isn't coming back up on restart. Could be a - # bug in bitcoind, or we've gotten unlucky with our dbcrash ratio -- + # If we got here, lbrycrdd isn't coming back up on restart. Could be a + # bug in lbrycrdd, or we've gotten unlucky with our dbcrash ratio -- # perhaps we generated a test case that blew up our cache? # TODO: If this happens a lot, we should try to restart without -dbcrashratio # and make sure that recovery happens. diff --git a/test/functional/feature_includeconf.py b/test/functional/feature_includeconf.py index 2cd6a05d0..43f9d62d9 100755 --- a/test/functional/feature_includeconf.py +++ b/test/functional/feature_includeconf.py @@ -32,7 +32,7 @@ class IncludeConfTest(BitcoinTestFramework): # - tmpdir/node0/relative2.conf with open(os.path.join(self.options.tmpdir, "node0", "relative2.conf"), "w", encoding="utf8") as f: f.write("uacomment=relative2\n") - with open(os.path.join(self.options.tmpdir, "node0", "bitcoin.conf"), "a", encoding='utf8') as f: + with open(os.path.join(self.options.tmpdir, "node0", "lbrycrd.conf"), "a", encoding='utf8') as f: f.write("uacomment=main\nincludeconf=relative.conf\n") def run_test(self): @@ -70,7 +70,7 @@ class IncludeConfTest(BitcoinTestFramework): # Restore initial file contents f.write("uacomment=relative\n") - with open(os.path.join(self.options.tmpdir, "node0", "bitcoin.conf"), "a", encoding='utf8') as f: + with open(os.path.join(self.options.tmpdir, "node0", "lbrycrd.conf"), "a", encoding='utf8') as f: f.write("includeconf=relative2.conf\n") self.start_node(0) diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py index be323d355..72d3e761b 100755 --- a/test/functional/feature_proxy.py +++ b/test/functional/feature_proxy.py @@ -2,13 +2,13 @@ # Copyright (c) 2015-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -"""Test bitcoind with different proxy configuration. +"""Test lbrycrdd with different proxy configuration. Test plan: -- Start bitcoind's with different proxy configurations +- Start lbrycrdd's with different proxy configurations - Use addnode to initiate connections - Verify that proxies are connected to, and the right connection command is given -- Proxy configurations to test on bitcoind side: +- Proxy configurations to test on lbrycrdd side: - `-proxy` (proxy everything) - `-onion` (proxy just onions) - `-proxyrandomize` Circuit randomization @@ -18,8 +18,8 @@ Test plan: - proxy on IPv6 - Create various proxies (as threads) -- Create bitcoinds that connect to them -- Manipulate the bitcoinds using addnode (onetry) an observe effects +- Create lbrycrdds that connect to them +- Manipulate the lbrycrdds using addnode (onetry) an observe effects addnode connect to IPv4 addnode connect to IPv6 @@ -96,7 +96,7 @@ class ProxyTest(BitcoinTestFramework): node.addnode("15.61.23.23:1234", "onetry") cmd = proxies[0].queue.get() assert isinstance(cmd, Socks5Command) - # Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6 + # Note: lbrycrdd's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6 assert_equal(cmd.atyp, AddressType.DOMAINNAME) assert_equal(cmd.addr, b"15.61.23.23") assert_equal(cmd.port, 1234) @@ -110,7 +110,7 @@ class ProxyTest(BitcoinTestFramework): node.addnode("[1233:3432:2434:2343:3234:2345:6546:4534]:5443", "onetry") cmd = proxies[1].queue.get() assert isinstance(cmd, Socks5Command) - # Note: bitcoind's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6 + # Note: lbrycrdd's SOCKS5 implementation only sends atyp DOMAINNAME, even if connecting directly to IPv4/IPv6 assert_equal(cmd.atyp, AddressType.DOMAINNAME) assert_equal(cmd.addr, b"1233:3432:2434:2343:3234:2345:6546:4534") assert_equal(cmd.port, 5443) diff --git a/test/functional/feature_reindex.py b/test/functional/feature_reindex.py index 09c178b6e..b2cdadb23 100755 --- a/test/functional/feature_reindex.py +++ b/test/functional/feature_reindex.py @@ -2,7 +2,7 @@ # Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -"""Test running bitcoind with -reindex and -reindex-chainstate options. +"""Test running lbrycrdd with -reindex and -reindex-chainstate options. - Start a single node and generate 3 blocks. - Stop the node and restart it with -reindex. Verify that the node has reindexed up to block 3. diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py index 4dc1e459a..60b1c83db 100755 --- a/test/functional/feature_versionbits_warning.py +++ b/test/functional/feature_versionbits_warning.py @@ -89,7 +89,7 @@ class VersionBitsWarningTest(BitcoinTestFramework): # is cleared. This will move the versionbit state to ACTIVE. node.generatetoaddress(VB_PERIOD, node_deterministic_address) - # Stop-start the node. This is required because bitcoind will only warn once about unknown versions or unknown rules activating. + # Stop-start the node. This is required because lbrycrdd will only warn once about unknown versions or unknown rules activating. self.restart_node(0) # Generating one block guarantees that we'll get out of IBD diff --git a/test/functional/interface_http.py b/test/functional/interface_http.py index bb868d711..ab61a4d63 100755 --- a/test/functional/interface_http.py +++ b/test/functional/interface_http.py @@ -88,7 +88,7 @@ class HTTPBasicsTest (BitcoinTestFramework): conn.request('POST', '/', '{"method": "getbestblockhash"}', headers) out1 = conn.getresponse().read() assert b'"error":null' in out1 - assert conn.sock is not None #connection must be closed because bitcoind should use keep-alive by default + assert conn.sock is not None #connection must be closed because lbrycrdd should use keep-alive by default # Check excessive request size conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port) diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py index e0f9436df..de6ede127 100755 --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -42,7 +42,7 @@ class ZMQTest (BitcoinTestFramework): def skip_test_if_missing_module(self): self.skip_if_no_py3_zmq() - self.skip_if_no_bitcoind_zmq() + self.skip_if_no_lbrycrdd_zmq() self.skip_if_no_wallet() def setup_nodes(self): @@ -67,7 +67,7 @@ class ZMQTest (BitcoinTestFramework): # Invalid zmq arguments don't take down the node, see #17185. self.restart_node(0, ["-zmqpubrawtx=foo", "-zmqpubhashtx=bar"]) - address = 'tcp://127.0.0.1:28332' + address = 'tcp://127.0.0.1:29245' socket = self.ctx.socket(zmq.SUB) socket.set(zmq.RCVTIMEO, 60000) diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index bb0169ee5..386b822b7 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -4,7 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool persistence. -By default, bitcoind will dump mempool on shutdown and +By default, lbrycrdd will dump mempool on shutdown and then reload it on startup. This can be overridden with the -persistmempool=0 command line option. @@ -123,7 +123,7 @@ class MempoolPersistTest(BitcoinTestFramework): wait_until(lambda: self.nodes[1].getmempoolinfo()["loaded"]) assert_equal(len(self.nodes[1].getrawmempool()), 5) - self.log.debug("Prevent bitcoind from writing mempool.dat to disk. Verify that `savemempool` fails") + self.log.debug("Prevent lbrycrdd from writing mempool.dat to disk. Verify that `savemempool` fails") # to test the exception we are creating a tmp folder called mempool.dat.new # which is an implementation detail that could change and break this test mempooldotnew1 = mempooldat1 + '.new' diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py index 7905cf501..57ef854be 100755 --- a/test/functional/p2p_compactblocks.py +++ b/test/functional/p2p_compactblocks.py @@ -16,7 +16,7 @@ from test_framework.script import CScript, OP_TRUE, OP_DROP from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal, wait_until, softfork_active -# TestP2PConn: A peer we use to send messages to bitcoind, and store responses. +# TestP2PConn: A peer we use to send messages to lbrycrdd, and store responses. class TestP2PConn(P2PInterface): def __init__(self, cmpct_version): super().__init__() @@ -241,7 +241,7 @@ class CompactBlocksTest(BitcoinTestFramework): old_node.request_headers_and_sync(locator=[tip]) check_announcement_of_new_block(node, old_node, lambda p: "cmpctblock" in p.last_message) - # This test actually causes bitcoind to (reasonably!) disconnect us, so do this last. + # This test actually causes lbrycrdd to (reasonably!) disconnect us, so do this last. def test_invalid_cmpctblock_message(self): self.nodes[0].generate(101) block = self.build_block_on_tip(self.nodes[0]) @@ -256,7 +256,7 @@ class CompactBlocksTest(BitcoinTestFramework): assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.hashPrevBlock) # Compare the generated shortids to what we expect based on BIP 152, given - # bitcoind's choice of nonce. + # lbrycrdd's choice of nonce. def test_compactblock_construction(self, test_node, use_witness_address=True): version = test_node.cmpct_version node = self.nodes[0] @@ -365,7 +365,7 @@ class CompactBlocksTest(BitcoinTestFramework): header_and_shortids.shortids.pop(0) index += 1 - # Test that bitcoind requests compact blocks when we announce new blocks + # Test that lbrycrdd requests compact blocks when we announce new blocks # via header or inv, and that responding to getblocktxn causes the block # to be successfully reconstructed. # Post-segwit: upgraded nodes would only make this request of cb-version-2, @@ -550,7 +550,7 @@ class CompactBlocksTest(BitcoinTestFramework): assert_equal(absolute_indexes, [6, 7, 8, 9, 10]) # Now give an incorrect response. - # Note that it's possible for bitcoind to be smart enough to know we're + # Note that it's possible for lbrycrdd to be smart enough to know we're # lying, since it could check to see if the shortid matches what we're # sending, and eg disconnect us for misbehavior. If that behavior # change was made, we could just modify this test by having a @@ -580,9 +580,9 @@ class CompactBlocksTest(BitcoinTestFramework): assert_equal(int(node.getbestblockhash(), 16), block.sha256) def test_getblocktxn_handler(self, test_node): + # lbrycrdd will not send blocktxn responses for blocks whose height is version = test_node.cmpct_version node = self.nodes[0] - # bitcoind will not send blocktxn responses for blocks whose height is # more than 10 blocks deep. MAX_GETBLOCKTXN_DEPTH = 10 chain_height = node.getblockcount() diff --git a/test/functional/p2p_leak.py b/test/functional/p2p_leak.py index 5a68872df..66218938d 100755 --- a/test/functional/p2p_leak.py +++ b/test/functional/p2p_leak.py @@ -58,7 +58,7 @@ class CLazyNode(P2PInterface): # anyway, and eventually get disconnected. class CNodeNoVersionBan(CLazyNode): # send a bunch of veracks without sending a message. This should get us disconnected. - # NOTE: implementation-specific check here. Remove if bitcoind ban behavior changes + # NOTE: implementation-specific check here. Remove if lbrycrdd ban behavior changes def on_open(self): super().on_open() for i in range(banscore): diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py index b41b07269..d53bdb41a 100755 --- a/test/functional/p2p_segwit.py +++ b/test/functional/p2p_segwit.py @@ -723,7 +723,7 @@ class SegWitTest(BitcoinTestFramework): # This transaction should not be accepted into the mempool pre- or # post-segwit. Mempool acceptance will use SCRIPT_VERIFY_WITNESS which # will require a witness to spend a witness program regardless of - # segwit activation. Note that older bitcoind's that are not + # segwit activation. Note that older lbrycrdd's that are not # segwit-aware would also reject this for failing CLEANSTACK. with self.nodes[0].assert_debug_log( expected_msgs=(spend_tx.hash, 'was not accepted: non-mandatory-script-verify-flag (Witness program was passed an empty witness)')): @@ -979,7 +979,7 @@ class SegWitTest(BitcoinTestFramework): self.nodes[0].submitblock(block.serialize().hex()) assert self.nodes[0].getbestblockhash() != block.hash - # Now redo commitment with the standard nonce, but let bitcoind fill it in. + # Now redo commitment with the standard nonce, but let lbrycrdd fill it in. add_witness_commitment(block, nonce=0) block.vtx[0].wit = CTxWitness() block.solve() diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py index 02ceec3dc..c6414de6c 100755 --- a/test/functional/p2p_timeouts.py +++ b/test/functional/p2p_timeouts.py @@ -4,7 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various net timeouts. -- Create three bitcoind nodes: +- Create three lbrycrdd nodes: no_verack_node - we never send a verack in response to their version no_version_node - we never send a version (only a ping) diff --git a/test/functional/rpc_bind.py b/test/functional/rpc_bind.py index 8979251a2..97030bbc4 100755 --- a/test/functional/rpc_bind.py +++ b/test/functional/rpc_bind.py @@ -2,7 +2,7 @@ # Copyright (c) 2014-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -"""Test running bitcoind with the -rpcbind and -rpcallowip options.""" +"""Test running lbrycrdd with the -rpcbind and -rpcallowip options.""" import sys diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py index 8bbb3c04f..2e0c2091a 100755 --- a/test/functional/rpc_users.py +++ b/test/functional/rpc_users.py @@ -38,7 +38,7 @@ class HTTPBasicsTest(BitcoinTestFramework): def setup_chain(self): super().setup_chain() - #Append rpcauth to bitcoin.conf before initialization + #Append rpcauth to lbrycrd.conf before initialization self.rtpassword = "cA773lm788buwYe4g4WT+05pKyNruVKjQ25x3n0DQcM=" rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144" @@ -62,11 +62,11 @@ class HTTPBasicsTest(BitcoinTestFramework): rpcauth3 = lines[1] self.password = lines[3] - with open(os.path.join(get_datadir_path(self.options.tmpdir, 0), "bitcoin.conf"), 'a', encoding='utf8') as f: + with open(os.path.join(get_datadir_path(self.options.tmpdir, 0), "lbrycrd.conf"), 'a', encoding='utf8') as f: f.write(rpcauth+"\n") f.write(rpcauth2+"\n") f.write(rpcauth3+"\n") - with open(os.path.join(get_datadir_path(self.options.tmpdir, 1), "bitcoin.conf"), 'a', encoding='utf8') as f: + with open(os.path.join(get_datadir_path(self.options.tmpdir, 1), "lbrycrd.conf"), 'a', encoding='utf8') as f: f.write("rpcuser={}\n".format(self.rpcuser)) f.write("rpcpassword={}\n".format(self.rpcpassword)) diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py index 4ba6ac1db..b4742e35b 100644 --- a/test/functional/test_framework/authproxy.py +++ b/test/functional/test_framework/authproxy.py @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this software; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -"""HTTP proxy for opening RPC connection to bitcoind. +"""HTTP proxy for opening RPC connection to lbrycrdd. AuthServiceProxy has the following improvements over python-jsonrpc's ServiceProxy class: diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 3cb5f56be..ddcc0c630 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -183,7 +183,7 @@ def FromHex(obj, hex_string): def ToHex(obj): return obj.serialize().hex() -# Objects that map to bitcoind objects, which can be serialized/deserialized +# Objects that map to lbrycrdd objects, which can be serialized/deserialized class CAddress: @@ -441,7 +441,7 @@ class CTransaction: if len(self.vin) == 0: flags = struct.unpack("