diff options
| author | Tomo Ueda <[email protected]> | 2021-09-02 12:22:51 -0700 |
|---|---|---|
| committer | Tomo Ueda <[email protected]> | 2021-09-02 12:22:51 -0700 |
| commit | 5dc1b84ed324b677ecb13d71fd38bcece1b54383 (patch) | |
| tree | 085f913c1181febcf2dc42cd11e086fd89f74d4c | |
| parent | Merge pull request #2469 from patricklodder/1.14.4-fixate (diff) | |
| download | discoin-5dc1b84ed324b677ecb13d71fd38bcece1b54383.tar.xz discoin-5dc1b84ed324b677ecb13d71fd38bcece1b54383.zip | |
s/doge/dis/g
| -rw-r--r-- | CONTRIBUTING.md | 6 | ||||
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | README.md | 26 | ||||
| -rw-r--r-- | README_zh_CN.md | 6 | ||||
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | contrib/init/README.md | 12 | ||||
| -rw-r--r-- | contrib/init/dogecoind.conf | 18 | ||||
| -rw-r--r-- | contrib/init/dogecoind.init | 28 | ||||
| -rw-r--r-- | contrib/init/dogecoind.openrc | 22 | ||||
| -rw-r--r-- | contrib/init/dogecoind.openrcconf | 26 | ||||
| -rw-r--r-- | contrib/init/dogecoind.service | 10 | ||||
| -rw-r--r-- | contrib/init/org.dogecoin.dogecoind.plist | 4 | ||||
| -rw-r--r-- | qa/README.md | 4 | ||||
| -rwxr-xr-x | qa/rpc-tests/fundrawtransaction.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/maxblocksinflight.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/multi_rpc.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/p2p-acceptblock.py | 4 | ||||
| -rwxr-xr-x | qa/rpc-tests/test_framework/mininode.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/test_framework/test_framework.py | 16 | ||||
| -rw-r--r-- | qa/rpc-tests/test_framework/util.py | 10 | ||||
| -rwxr-xr-x | qa/rpc-tests/wallet.py | 2 |
23 files changed, 117 insertions, 117 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eb6fb153c..20c2b65e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,9 +4,9 @@ Dogecoin Core is open source software, and we would welcome contributions which improve the state of the software. For those wanting to discuss changes, or look for work that needs doing, please see: -* [Help requests](https://github.com/dogecoin/dogecoin/labels/help%20wanted) -* [Projects](https://github.com/dogecoin/dogecoin/projects) -* [Dogecoindev on reddit](https://www.reddit.com/r/dogecoindev/) +* [Help requests](https://github.com/discoin/discoin/labels/help%20wanted) +* [Projects](https://github.com/discoin/discoin/projects) +* [Dogecoindev on reddit](https://www.reddit.com/r/discoindev/) ## Branch Strategy diff --git a/INSTALL.md b/INSTALL.md index 51fb2dc2c..5d15c8d68 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -4,7 +4,7 @@ The easiest way to install the latest version of the Dogecoin Core software is by to download the latest precompiled binaries for your platform from the -[release page](https://github.com/dogecoin/dogecoin/releases). Currently, +[release page](https://github.com/discoin/discoin/releases). Currently, binaries are released for the following platforms: - Windows, 64-bit and 32-bit @@ -65,7 +65,7 @@ to see it. **testnet and regtest modes** -Run with the `-testnet` option to run with "play dogecoins" on the test network, if you +Run with the `-testnet` option to run with "play discoins" on the test network, if you are testing multi-machine code that needs to operate across the internet. If you are testing something that can run on one machine, run with the `-regtest` option. diff --git a/Makefile.am b/Makefile.am index 4d44fc7d6..0418d4429 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,16 +39,16 @@ OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) -DIST_CONTRIB = $(top_srcdir)/contrib/dogecoin-cli.bash-completion \ - $(top_srcdir)/contrib/dogecoin-tx.bash-completion \ - $(top_srcdir)/contrib/dogecoind.bash-completion \ +DIST_CONTRIB = $(top_srcdir)/contrib/discoin-cli.bash-completion \ + $(top_srcdir)/contrib/discoin-tx.bash-completion \ + $(top_srcdir)/contrib/discoind.bash-completion \ $(top_srcdir)/contrib/init \ $(top_srcdir)/contrib/rpm BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py -WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/dogecoin.ico \ +WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/discoin.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt @@ -6,8 +6,8 @@ Dogecoin Core [DOGE, Ð] <div align="center"> -[](https://dogecoin.com) -[](https://dogecoin.com) +[](https://discoin.com) +[](https://discoin.com) </div> @@ -17,7 +17,7 @@ Dogecoin is a cryptocurrency like Bitcoin, although it does not use SHA256 as its proof of work (POW). Taking development cues from Tenebrix and Litecoin, Dogecoin currently employs a simplified variant of scrypt. -**Website:** [dogecoin.com](https://dogecoin.com) +**Website:** [discoin.com](https://discoin.com) ## Installation 💻 @@ -45,12 +45,12 @@ software. Main development resources: -* [Github Projects](https://github.com/dogecoin/dogecoin/projects) is used to +* [Github Projects](https://github.com/discoin/discoin/projects) is used to follow planned and in-progress work for upcoming releases. -* [Github Discussion](https://github.com/dogecoin/dogecoin/discussions) is used +* [Github Discussion](https://github.com/discoin/discoin/discussions) is used to discuss features, planned and unplanned, related to both the development of the Dogecoin Core software, the underlying protocols and the DOGE asset. -* [Dogecoindev subreddit](https://www.reddit.com/r/dogecoindev/) +* [Dogecoindev subreddit](https://www.reddit.com/r/discoindev/) ### Version strategy Version numbers are following ```major.minor.patch``` semantics. @@ -70,11 +70,11 @@ There are 3 types of branches in this repository: ## Contributing 🤝 If you find a bug or experience issues with this software, please report it -using the [issue system](https://github.com/dogecoin/dogecoin/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5Bbug%5D+). +using the [issue system](https://github.com/discoin/discoin/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5Bbug%5D+). Please see [the contribution guide](CONTRIBUTING.md) to see how you can participate in the development of Dogecoin Core. There are often -[topics seeking help](https://github.com/dogecoin/dogecoin/labels/help%20wanted) +[topics seeking help](https://github.com/discoin/discoin/labels/help%20wanted) where your contributions will have high impact and get very appreciation. wow. ## Communities 🚀🍾 @@ -85,16 +85,16 @@ about Dogecoin, give or ask for help, to share your project. Here are some places to visit: -* [Dogecoin subreddit](https://www.reddit.com/r/dogecoin/) -* [Dogeducation subreddit](https://www.reddit.com/r/dogeducation/) -* [Discord](https://discord.gg/dogecoin) -* [Dogecoin Twitter](https://twitter.com/dogecoin) +* [Dogecoin subreddit](https://www.reddit.com/r/discoin/) +* [Dogeducation subreddit](https://www.reddit.com/r/disducation/) +* [Discord](https://discord.gg/discoin) +* [Dogecoin Twitter](https://twitter.com/discoin) ## Very Much Frequently Asked Questions ❓ Do you have a question regarding Dogecoin? An answer is perhaps already in the [FAQ](doc/FAQ.md) or the -[Q&A section](https://github.com/dogecoin/dogecoin/discussions/categories/q-a) +[Q&A section](https://github.com/discoin/discoin/discussions/categories/q-a) of the discussion board! ## License - Much license ⚖️ diff --git a/README_zh_CN.md b/README_zh_CN.md index c44bacadf..7ee2b3073 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -2,12 +2,12 @@  -[](https://travis-ci.com/dogecoin/dogecoin) +[](https://travis-ci.com/discoin/discoin) 选择文档语言: [英文](../README.md) | 简体中文 | [其他语言...](./README_zh_CN.md) 尽管狗狗币不使用SHA256作为它的工作量证明(POW),狗狗币也是一款类似Bitcoin的加密货币。受到Tenebrix和Litecoin的影响,狗狗币目前采用一种更简洁的加密方式。 -- **网址:** [dogecoin.com.](https://dogecoin.com) +- **网址:** [discoin.com.](https://discoin.com) ## 证书 – 炫酷的证书 ⚖️ 狗狗币在MIT liscence的条款下发行。详情请参见 @@ -85,7 +85,7 @@ RPC界面上还有由Python编写的[回归和整合测试(regression and inte 600,000+: 10,000 Dogecoin -### 请编译我吧 / Wow plz make dogecoind/dogecoin-cli/dogecoin-qt +### 请编译我吧 / Wow plz make discoind/discoin-cli/discoin-qt 以下是开发者的笔记,教你如何在你自己的平台上搭建狗狗币。这些不是什么权威指南,但包含了必要的libary, 编译flag 等等。 diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 0cbfef9cf..fd4a2c805 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -7,7 +7,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit. AC_DEFUN([BITCOIN_QT_FAIL],[ if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then if test x$bitcoin_enable_qt != xno; then - AC_MSG_WARN([$1; dogecoin-qt frontend will not be built]) + AC_MSG_WARN([$1; discoin-qt frontend will not be built]) fi bitcoin_enable_qt=no bitcoin_enable_qt_test=no diff --git a/configure.ac b/configure.ac index b96febce8..f811786bc 100644 --- a/configure.ac +++ b/configure.ac @@ -8,16 +8,16 @@ define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and Dogecoin Core]]) -AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/dogecoin/dogecoin/issues],[dogecoin],[https://dogecoin.com/]) +AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/discoin/discoin/issues],[discoin],[https://discoin.com/]) AC_CONFIG_SRCDIR([src/validation.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=dogecoind -BITCOIN_GUI_NAME=dogecoin-qt -BITCOIN_CLI_NAME=dogecoin-cli -BITCOIN_TX_NAME=dogecoin-tx +BITCOIN_DAEMON_NAME=discoind +BITCOIN_GUI_NAME=discoin-qt +BITCOIN_CLI_NAME=discoin-cli +BITCOIN_TX_NAME=discoin-tx AC_CANONICAL_HOST @@ -916,11 +916,11 @@ AC_SUBST(UNIVALUE_LIBS) BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build dogecoind]) +AC_MSG_CHECKING([whether to build discoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (dogecoin-cli dogecoin-tx)]) +AC_MSG_CHECKING([whether to build utils (discoin-cli discoin-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -1021,7 +1021,7 @@ if test x$bitcoin_enable_qt != xno; then AC_MSG_WARN("xgettext is required to update qt translations") fi - AC_MSG_CHECKING([whether to build test_dogecoin-qt]) + AC_MSG_CHECKING([whether to build test_discoin-qt]) if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" @@ -1032,7 +1032,7 @@ fi AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"]) -AC_MSG_CHECKING([whether to build test_dogecoin]) +AC_MSG_CHECKING([whether to build test_discoin]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" diff --git a/contrib/init/README.md b/contrib/init/README.md index 0f1517bce..b387ccab6 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,11 +1,11 @@ Sample configuration files for: -SystemD: dogecoind.service -Upstart: dogecoind.conf -OpenRC: dogecoind.openrc - dogecoind.openrcconf -CentOS: dogecoind.init -OS X: org.dogecoin.dogecoind.plist +SystemD: discoind.service +Upstart: discoind.conf +OpenRC: discoind.openrc + discoind.openrcconf +CentOS: discoind.init +OS X: org.discoin.discoind.plist have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/dogecoind.conf b/contrib/init/dogecoind.conf index 8faf8bd58..036079935 100644 --- a/contrib/init/dogecoind.conf +++ b/contrib/init/dogecoind.conf @@ -3,14 +3,14 @@ description "Dogecoin Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env DOGECOIND_BIN="/usr/bin/dogecoind" -env DOGECOIND_USER="dogecoin" -env DOGECOIND_GROUP="dogecoin" -env DOGECOIND_PIDDIR="/var/run/dogecoind" +env DOGECOIND_BIN="/usr/bin/discoind" +env DOGECOIND_USER="discoin" +env DOGECOIND_GROUP="discoin" +env DOGECOIND_PIDDIR="/var/run/discoind" # upstart can't handle variables constructed with other variables -env DOGECOIND_PIDFILE="/var/run/dogecoind/dogecoind.pid" -env DOGECOIND_CONFIGFILE="/etc/dogecoin/dogecoin.conf" -env DOGECOIND_DATADIR="/var/lib/dogecoind" +env DOGECOIND_PIDFILE="/var/run/discoind/discoind.pid" +env DOGECOIND_CONFIGFILE="/etc/discoin/discoin.conf" +env DOGECOIND_DATADIR="/var/lib/discoind" expect fork @@ -20,12 +20,12 @@ kill timeout 60 pre-start script # this will catch non-existent config files - # dogecoind will check and exit with this very warning, but it can do so + # discoind will check and exit with this very warning, but it can do so # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. if ! grep -qs '^rpcpassword=' "$DOGECOIND_CONFIGFILE" ; then - echo "ERROR: You must set a secure rpcpassword to run dogecoind." + echo "ERROR: You must set a secure rpcpassword to run discoind." echo "The setting must appear in $DOGECOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " diff --git a/contrib/init/dogecoind.init b/contrib/init/dogecoind.init index c00d18f7e..57cc74fc7 100644 --- a/contrib/init/dogecoind.init +++ b/contrib/init/dogecoind.init @@ -1,36 +1,36 @@ #!/bin/bash # -# dogecoind The dogecoin core server. +# discoind The discoin core server. # # # chkconfig: 345 80 20 -# description: dogecoind -# processname: dogecoind +# description: discoind +# processname: discoind # # Source function library. . /etc/init.d/functions -# you can override defaults in /etc/sysconfig/dogecoind, see below -if [ -f /etc/sysconfig/dogecoind ]; then - . /etc/sysconfig/dogecoind +# you can override defaults in /etc/sysconfig/discoind, see below +if [ -f /etc/sysconfig/discoind ]; then + . /etc/sysconfig/discoind fi RETVAL=0 -prog=dogecoind -# you can override the lockfile via DOGECOIND_LOCKFILE in /etc/sysconfig/dogecoind -lockfile=${DOGECOIND_LOCKFILE-/var/lock/subsys/dogecoind} +prog=discoind +# you can override the lockfile via DOGECOIND_LOCKFILE in /etc/sysconfig/discoind +lockfile=${DOGECOIND_LOCKFILE-/var/lock/subsys/discoind} -# dogecoind defaults to /usr/bin/dogecoind, override with DOGECOIND_BIN -dogecoind=${DOGECOIND_BIN-/usr/bin/dogecoind} +# discoind defaults to /usr/bin/discoind, override with DOGECOIND_BIN +discoind=${DOGECOIND_BIN-/usr/bin/discoind} -# dogecoind opts default to -disablewallet, override with DOGECOIND_OPTS -dogecoind_opts=${DOGECOIND_OPTS--disablewallet} +# discoind opts default to -disablewallet, override with DOGECOIND_OPTS +discoind_opts=${DOGECOIND_OPTS--disablewallet} start() { echo -n $"Starting $prog: " - daemon $DAEMONOPTS $dogecoind $dogecoind_opts + daemon $DAEMONOPTS $discoind $discoind_opts RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/contrib/init/dogecoind.openrc b/contrib/init/dogecoind.openrc index 5d9c269d5..1ccf53962 100644 --- a/contrib/init/dogecoind.openrc +++ b/contrib/init/dogecoind.openrc @@ -2,26 +2,26 @@ # backward compatibility for existing gentoo layout # -if [ -d "/var/lib/dogecoin/.dogecoin" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/dogecoin/.dogecoin" +if [ -d "/var/lib/discoin/.discoin" ]; then + BITCOIND_DEFAULT_DATADIR="/var/lib/discoin/.discoin" else - BITCOIND_DEFAULT_DATADIR="/var/lib/dogecoind" + BITCOIND_DEFAULT_DATADIR="/var/lib/discoind" fi -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dogecoin/dogecoin.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/dogecoind} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/dogecoind.pid} +BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/discoin/discoin.conf} +BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/discoind} +BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/discoind.pid} BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-dogecoin}} -BITCOIND_GROUP=${BITCOIND_GROUP:-dogecoin} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/dogecoind} +BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-discoin}} +BITCOIND_GROUP=${BITCOIND_GROUP:-discoin} +BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/discoind} BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="Bitcoin Core Daemon" description="Bitcoin cryptocurrency P2P network daemon" -command="/usr/bin/dogecoind" +command="/usr/bin/discoind" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ -conf=\"${BITCOIND_CONFIGFILE}\" \ -datadir=\"${BITCOIND_DATADIR}\" \ @@ -71,7 +71,7 @@ checkconfig() { if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then eerror "" - eerror "ERROR: You must set a secure rpcpassword to run dogecoind." + eerror "ERROR: You must set a secure rpcpassword to run discoind." eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " diff --git a/contrib/init/dogecoind.openrcconf b/contrib/init/dogecoind.openrcconf index 307c9e2e5..8c8178d63 100644 --- a/contrib/init/dogecoind.openrcconf +++ b/contrib/init/dogecoind.openrcconf @@ -1,31 +1,31 @@ -# /etc/conf.d/dogecoind: config file for /etc/init.d/dogecoind +# /etc/conf.d/discoind: config file for /etc/init.d/discoind # Config file location -#DOGECOIND_CONFIGFILE="/etc/dogecoin/dogecoin.conf" +#DOGECOIND_CONFIGFILE="/etc/discoin/discoin.conf" # What directory to write pidfile to? (created and owned by $DOGECOIND_USER) -#DOGECOIND_PIDDIR="/var/run/dogecoind" +#DOGECOIND_PIDDIR="/var/run/discoind" # What filename to give the pidfile -#DOGECOIND_PIDFILE="${DOGECOIND_PIDDIR}/dogecoind.pid" +#DOGECOIND_PIDFILE="${DOGECOIND_PIDDIR}/discoind.pid" -# Where to write dogecoind data (be mindful that the blockchain is large) -#DOGECOIND_DATADIR="/var/lib/dogecoind" +# Where to write discoind data (be mindful that the blockchain is large) +#DOGECOIND_DATADIR="/var/lib/discoind" -# User and group to own dogecoind process -#DOGECOIND_USER="dogecoin" -#DOGECOIND_GROUP="dogecoin" +# User and group to own discoind process +#DOGECOIND_USER="discoin" +#DOGECOIND_GROUP="discoin" -# Path to dogecoind executable -#DOGECOIND_BIN="/usr/bin/dogecoind" +# Path to discoind executable +#DOGECOIND_BIN="/usr/bin/discoind" -# Nice value to run dogecoind under +# Nice value to run discoind under #DOGECOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) DOGECOIND_OPTS="-disablewallet" -# The timeout in seconds OpenRC will wait for dogecoind to terminate +# The timeout in seconds OpenRC will wait for discoind to terminate # after a SIGTERM has been raised. # Note that this will be mapped as argument to start-stop-daemon's # '--retry' option, which means you can specify a retry schedule diff --git a/contrib/init/dogecoind.service b/contrib/init/dogecoind.service index 159222280..f76bb8532 100644 --- a/contrib/init/dogecoind.service +++ b/contrib/init/dogecoind.service @@ -3,13 +3,13 @@ Description=Dogecoin's distributed currency daemon After=network.target [Service] -User=dogecoin -Group=dogecoin +User=discoin +Group=discoin Type=forking -PIDFile=/var/lib/dogecoind/dogecoind.pid -ExecStart=/usr/bin/dogecoind -daemon -pid=/var/lib/dogecoind/dogecoind.pid \ --conf=/etc/dogecoin/dogecoin.conf -datadir=/var/lib/dogecoind -disablewallet +PIDFile=/var/lib/discoind/discoind.pid +ExecStart=/usr/bin/discoind -daemon -pid=/var/lib/discoind/discoind.pid \ +-conf=/etc/discoin/discoin.conf -datadir=/var/lib/discoind -disablewallet Restart=always PrivateTmp=true diff --git a/contrib/init/org.dogecoin.dogecoind.plist b/contrib/init/org.dogecoin.dogecoind.plist index b8b3ad213..01817b595 100644 --- a/contrib/init/org.dogecoin.dogecoind.plist +++ b/contrib/init/org.dogecoin.dogecoind.plist @@ -3,10 +3,10 @@ <plist version="1.0"> <dict> <key>Label</key> - <string>org.dogecoin.dogecoind</string> + <string>org.discoin.discoind</string> <key>ProgramArguments</key> <array> - <string>/usr/local/bin/dogecoind</string> + <string>/usr/local/bin/discoind</string> <string>-daemon</string> </array> <key>RunAtLoad</key> diff --git a/qa/README.md b/qa/README.md index d0d54a0c4..59d1be626 100644 --- a/qa/README.md +++ b/qa/README.md @@ -1,7 +1,7 @@ The [pull-tester](/qa/pull-tester/) folder contains a script to call multiple tests from the [rpc-tests](/qa/rpc-tests/) folder. -Every pull request to the dogecoin repository is built and run through +Every pull request to the discoin repository is built and run through the regression test suite. You can also run all or only individual tests locally. @@ -80,7 +80,7 @@ to recover with: ```bash rm -rf cache -killall dogecoind +killall discoind ``` Writing tests diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py index 7274e9c41..73ad0f2c1 100755 --- a/qa/rpc-tests/fundrawtransaction.py +++ b/qa/rpc-tests/fundrawtransaction.py @@ -193,7 +193,7 @@ class RawTransactionsTest(BitcoinTestFramework): dec_tx = self.nodes[2].decoderawtransaction(rawtx) assert_equal(utx['txid'], dec_tx['vin'][0]['txid']) - assert_raises_jsonrpc(-5, "changeAddress must be a valid dogecoin address", self.nodes[2].fundrawtransaction, rawtx, {'changeAddress':'foobar'}) + assert_raises_jsonrpc(-5, "changeAddress must be a valid discoin address", self.nodes[2].fundrawtransaction, rawtx, {'changeAddress':'foobar'}) ############################################################ # test a fundrawtransaction with a provided change address # diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py index ff6fbeee4..7bf7ed516 100755 --- a/qa/rpc-tests/maxblocksinflight.py +++ b/qa/rpc-tests/maxblocksinflight.py @@ -73,7 +73,7 @@ class TestManager(NodeConnCB): class MaxBlocksInFlightTest(BitcoinTestFramework): def add_options(self, parser): parser.add_option("--testbinary", dest="testbinary", - default=os.getenv("DOGECOIND", "dogecoind"), + default=os.getenv("DOGECOIND", "discoind"), help="Binary to test max block requests behavior") def __init__(self): diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py index 2facf6c9c..d666caf24 100755 --- a/qa/rpc-tests/multi_rpc.py +++ b/qa/rpc-tests/multi_rpc.py @@ -26,7 +26,7 @@ class HTTPBasicsTest (BitcoinTestFramework): #Append rpcauth to bitcoin.conf before initialization rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144" rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e" - with open(os.path.join(self.options.tmpdir+"/node0", "dogecoin.conf"), 'a', encoding='utf8') as f: + with open(os.path.join(self.options.tmpdir+"/node0", "discoin.conf"), 'a', encoding='utf8') as f: f.write(rpcauth+"\n") f.write(rpcauth2+"\n") diff --git a/qa/rpc-tests/p2p-acceptblock.py b/qa/rpc-tests/p2p-acceptblock.py index d06bcf5a3..c77fa522c 100755 --- a/qa/rpc-tests/p2p-acceptblock.py +++ b/qa/rpc-tests/p2p-acceptblock.py @@ -128,8 +128,8 @@ class TestNode(NodeConnCB): class AcceptBlockTest(BitcoinTestFramework): def add_options(self, parser): parser.add_option("--testbinary", dest="testbinary", - default=os.getenv("DOGECOIND", "dogecoind"), - help="dogecoind binary to test") + default=os.getenv("DOGECOIND", "discoind"), + help="discoind binary to test") def __init__(self): super().__init__() diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 964e98a1c..59a6fb41b 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -47,7 +47,7 @@ MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version MAX_INV_SZ = 50000 MAX_BLOCK_BASE_SIZE = 1000000 -COIN = 100000000 # mlumin 5/2021: In terms of Dogecoin, 1 dogecoin or 100,000,000 koinu. +COIN = 100000000 # mlumin 5/2021: In terms of Dogecoin, 1 discoin or 100,000,000 koinu. NODE_NETWORK = (1 << 0) NODE_GETUTXO = (1 << 1) diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 7dd368130..1487b849e 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -104,11 +104,11 @@ class BitcoinTestFramework(object): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true", - help="Leave dogecoinds and test.* datadir on exit or error") + help="Leave discoinds and test.* datadir on exit or error") parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true", - help="Don't stop dogecoinds after the test execution") + help="Don't stop discoinds after the test execution") parser.add_option("--srcdir", dest="srcdir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../../src"), - help="Source directory containing dogecoind/bitcoin-cli (default: %default)") + help="Source directory containing discoind/bitcoin-cli (default: %default)") parser.add_option("--cachedir", dest="cachedir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../cache"), help="Directory for caching pregenerated datadirs") parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"), @@ -163,7 +163,7 @@ class BitcoinTestFramework(object): print("Stopping nodes") stop_nodes(self.nodes) else: - print("Note: dogecoinds were not stopped and may still be running") + print("Note: discoinds were not stopped and may still be running") if not self.options.nocleanup and not self.options.noshutdown and success: print("Cleaning up") @@ -205,11 +205,11 @@ class ComparisonTestFramework(BitcoinTestFramework): def add_options(self, parser): parser.add_option("--testbinary", dest="testbinary", - default=os.getenv("DOGECOIND", "dogecoind"), - help="dogecoind binary to test") + default=os.getenv("DOGECOIND", "discoind"), + help="discoind binary to test") parser.add_option("--refbinary", dest="refbinary", - default=os.getenv("DOGECOIND", "dogecoind"), - help="dogecoind binary to use for reference nodes (if any)") + default=os.getenv("DOGECOIND", "discoind"), + help="discoind binary to use for reference nodes (if any)") def setup_network(self): self.nodes = start_nodes( diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index a9723df07..078aacca1 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -183,7 +183,7 @@ def initialize_datadir(dirname, n): if not os.path.isdir(datadir): os.makedirs(datadir) rpc_u, rpc_p = rpc_auth_pair(n) - with open(os.path.join(datadir, "dogecoin.conf"), 'w', encoding='utf8') as f: + with open(os.path.join(datadir, "discoin.conf"), 'w', encoding='utf8') as f: f.write("regtest=1\n") f.write("rpcuser=" + rpc_u + "\n") f.write("rpcpassword=" + rpc_p + "\n") @@ -250,12 +250,12 @@ def initialize_chain(test_dir, num_nodes, cachedir): # Create cache directories, run bitcoinds: for i in range(MAX_NODES): datadir=initialize_datadir(cachedir, i) - args = [ os.getenv("DOGECOIND", "dogecoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ] + args = [ os.getenv("DOGECOIND", "discoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ] if i > 0: args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) if os.getenv("PYTHON_DEBUG", ""): - print("initialize_chain: dogecoind started, waiting for RPC to come up") + print("initialize_chain: discoind started, waiting for RPC to come up") wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i) if os.getenv("PYTHON_DEBUG", ""): print("initialize_chain: RPC successfully started") @@ -336,12 +336,12 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary= """ datadir = os.path.join(dirname, "node"+str(i)) if binary is None: - binary = os.getenv("DOGECOIND", "dogecoind") + binary = os.getenv("DOGECOIND", "discoind") args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-mocktime="+str(get_mocktime()) ] if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args) if os.getenv("PYTHON_DEBUG", ""): - print("start_node: dogecoind started, waiting for RPC to come up") + print("start_node: discoind started, waiting for RPC to come up") url = rpc_url(i, rpchost) wait_for_bitcoind_start(bitcoind_processes[i], url, i) if os.getenv("PYTHON_DEBUG", ""): diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py index e7d6aa794..b65dec3e4 100755 --- a/qa/rpc-tests/wallet.py +++ b/qa/rpc-tests/wallet.py @@ -81,7 +81,7 @@ class WalletTest (BitcoinTestFramework): self.nodes[1].generate(60) self.sync_all() - # node0 should end up with 1.000.000 doge in block rewards plus fees, but + # node0 should end up with 1.000.000 dis in block rewards plus fees, but # minus the 210.000 plus fees sent to node2 assert_equal(self.nodes[0].getbalance(), 1000000-210000) assert_equal(self.nodes[2].getbalance(), 210000) |