Merge #12543: Fix typos
d918eb7864
Fix typos (practicalswift)
Pull request description:
Fix typos.
Tree-SHA512: c790e49be6e01c8d70ebd872ef61cc210c1de15c4a1e5a98280169f32dc8a14cd68f4dd1c23afc76758b28ef355ab12ded2ff7504562dc9b69a11839ad3cd7e3
This commit is contained in:
commit
480f42630c
3 changed files with 4 additions and 4 deletions
|
@ -35,7 +35,7 @@ To install WSL on Windows 10 with Fall Creators Update installed (version >= 162
|
|||
|
||||
1. Enable the Windows Subsystem for Linux feature
|
||||
* Open the Windows Features dialog (`OptionalFeatures.exe`)
|
||||
* Enable 'Windows Susbsystem for Linux'
|
||||
* Enable 'Windows Subsystem for Linux'
|
||||
* Click 'OK' and restart if necessary
|
||||
2. Install Ubuntu
|
||||
* Open Microsoft Store and search for Ubuntu or use [this link](https://www.microsoft.com/store/productId/9NBLGGH4MSV6)
|
||||
|
|
|
@ -754,7 +754,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
|
|||
thr.join();
|
||||
BOOST_CHECK_EQUAL(threadresult, true);
|
||||
#ifndef WIN32
|
||||
// Try to aquire lock in child process while we're holding it, this should fail.
|
||||
// Try to acquire lock in child process while we're holding it, this should fail.
|
||||
char ch;
|
||||
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
|
||||
BOOST_CHECK_EQUAL(read(fd[1], &ch, 1), 1);
|
||||
|
@ -765,7 +765,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
|
|||
// Probing lock from our side now should succeed, but not hold on to the lock.
|
||||
BOOST_CHECK_EQUAL(LockDirectory(dirname, lockname, true), true);
|
||||
|
||||
// Try to acquire the lock in the child process, this should be succesful.
|
||||
// Try to acquire the lock in the child process, this should be successful.
|
||||
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
|
||||
BOOST_CHECK_EQUAL(read(fd[1], &ch, 1), 1);
|
||||
BOOST_CHECK_EQUAL((bool)ch, true);
|
||||
|
|
|
@ -49,7 +49,7 @@ def read_dump(file_name, addrs, script_addrs, hd_master_addr_old):
|
|||
# count key types
|
||||
for addrObj in addrs:
|
||||
if addrObj['address'] == addr.split(",")[0] and addrObj['hdkeypath'] == keypath and keytype == "label=":
|
||||
# a labled entry in the wallet should contain both a native address
|
||||
# a labeled entry in the wallet should contain both a native address
|
||||
# and the p2sh-p2wpkh address that was added at wallet setup
|
||||
if len(addr.split(",")) == 2:
|
||||
addr_list = addr.split(",")
|
||||
|
|
Loading…
Reference in a new issue