Skip to content

Commit

Permalink
Adapt Unit-e naming (#765)
Browse files Browse the repository at this point in the history
Consistently use `Unit-e` and `unit-e` throughout the whole code
base.

This is the counterpart to the changes to clonemachine done in
dtr-org/unit-e-clonemachine#22. They both result
in the same changes, so that merge conflicts on the next upstream
sync are avoided.

Signed-off-by: Cornelius Schumacher <cornelius@thirdhash.com>
  • Loading branch information
cornelius committed Mar 20, 2019
1 parent c581f4d commit 0742841
Show file tree
Hide file tree
Showing 78 changed files with 171 additions and 171 deletions.
2 changes: 1 addition & 1 deletion contrib/devtools/README.md
Expand Up @@ -23,7 +23,7 @@ git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
copyright\_header.py
====================

Provides utilities for managing copyright headers of `The UnitE Core
Provides utilities for managing copyright headers of `The unit-e
developers` in repository source files. It has three subcommands:

```
Expand Down
4 changes: 2 additions & 2 deletions contrib/init/united.conf
@@ -1,4 +1,4 @@
description "UnitE Core Daemon"
description "unit-e Daemon"

start on runlevel [2345]
stop on starting rc RUNLEVEL=[016]
Expand Down Expand Up @@ -38,7 +38,7 @@ pre-start script
echo "It is recommended that you also set alertnotify so you are "
echo "notified of problems:"
echo
echo "ie: alertnotify=echo %%s | mail -s \"UnitE Alert\"" \
echo "ie: alertnotify=echo %%s | mail -s \"Unit-e Alert\"" \
"admin@foo.com"
echo
exit 1
Expand Down
2 changes: 1 addition & 1 deletion contrib/init/united.init
@@ -1,6 +1,6 @@
#!/bin/bash
#
# united The unite core server.
# united The unit-e server.
#
#
# chkconfig: 345 80 20
Expand Down
6 changes: 3 additions & 3 deletions contrib/init/united.openrc
Expand Up @@ -18,8 +18,8 @@ UNITED_BIN=${UNITED_BIN:-/usr/bin/united}
UNITED_NICE=${UNITED_NICE:-${NICELEVEL:-0}}
UNITED_OPTS="${UNITED_OPTS:-${UNITE_OPTS}}"

name="UnitE Core Daemon"
description="UnitE cryptocurrency P2P network daemon"
name="unit-e Daemon"
description="Unit-e cryptocurrency P2P network daemon"

command="/usr/bin/united"
command_args="-pid=\"${UNITED_PIDFILE}\" \
Expand Down Expand Up @@ -84,7 +84,7 @@ checkconfig()
eerror "It is recommended that you also set alertnotify so you are "
eerror "notified of problems:"
eerror ""
eerror "ie: alertnotify=echo %%s | mail -s \"UnitE Alert\"" \
eerror "ie: alertnotify=echo %%s | mail -s \"Unit-e Alert\"" \
"admin@foo.com"
eerror ""
return 1
Expand Down
2 changes: 1 addition & 1 deletion contrib/init/united.service
Expand Up @@ -8,7 +8,7 @@
# /etc/unite/unite.conf

[Unit]
Description=UnitE daemon
Description=Unit-e daemon
After=network.target

[Service]
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/README.md
@@ -1,5 +1,5 @@
# Linearize
Construct a linear, no-fork, best version of the UnitE blockchain. The scripts
Construct a linear, no-fork, best version of the Unit-e blockchain. The scripts
run using Python 3 but are compatible with Python 2.

## Step 1: Download hash list
Expand Down
2 changes: 1 addition & 1 deletion contrib/qos/README.md
@@ -1,5 +1,5 @@
### QoS (Quality of service) ###

This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the UnitE network. It limits outbound TCP traffic with a source or destination port of 7182, but not if the destination IP is within a LAN.
This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Unit-e network. It limits outbound TCP traffic with a source or destination port of 7182, but not if the destination IP is within a LAN.

This means one can have an always-on united instance running, and another local united instance which connects to this node and receives blocks from it.
2 changes: 1 addition & 1 deletion contrib/qos/tc.sh
Expand Up @@ -7,7 +7,7 @@
IF="eth0"
#limit of the network interface in question
LINKCEIL="1gbit"
#limit outbound UnitE protocol traffic to this rate
#limit outbound Unit-e protocol traffic to this rate
LIMIT="160kbit"
#defines the IPv4 address space for which you wish to disable rate limiting
LOCALNET_V4="192.168.0.0/16"
Expand Down
2 changes: 1 addition & 1 deletion contrib/testgen/README.md
@@ -1,6 +1,6 @@
### TestGen ###

Utilities to generate test vectors for the data-driven UnitE tests.
Utilities to generate test vectors for the data-driven Unit-e tests.

Usage:

Expand Down
4 changes: 2 additions & 2 deletions contrib/testgen/base58.py
Expand Up @@ -2,7 +2,7 @@
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
'''
UnitE base58 encoding and decoding.
Unit-e base58 encoding and decoding.
Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain)
'''
Expand Down Expand Up @@ -37,7 +37,7 @@ def b58encode(v):
long_value = div
result = __b58chars[long_value] + result

# UnitE does a little leading-zero-compression:
# Unit-e does a little leading-zero-compression:
# leading 0-bytes in the input become leading-1s
nPad = 0
for c in v:
Expand Down
12 changes: 6 additions & 6 deletions contrib/tidy_datadir.sh
Expand Up @@ -7,7 +7,7 @@ if [ -d "$1" ]; then
cd "$1" || exit 1
else
echo "Usage: $0 <datadir>" >&2
echo "Removes obsolete UnitE database files" >&2
echo "Removes obsolete Unit-e database files" >&2
exit 1
fi

Expand All @@ -19,22 +19,22 @@ if [ -f wallet.dat -a -f peers.dat -a -f chainstate/CURRENT -a -f blocks/index/C

case $LEVEL in
0)
echo "Error: no UnitE datadir detected."
echo "Error: no Unit-e datadir detected."
exit 1
;;
1)
echo "Detected old UnitE datadir (before 0.7)."
echo "Detected old Unit-e datadir (before 0.7)."
echo "Nothing to do."
exit 0
;;
2)
echo "Detected UnitE 0.7 datadir."
echo "Detected Unit-e 0.7 datadir."
;;
3)
echo "Detected UnitE pre-0.8 datadir."
echo "Detected Unit-e pre-0.8 datadir."
;;
4)
echo "Detected UnitE 0.8 datadir."
echo "Detected Unit-e 0.8 datadir."
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion contrib/valgrind.supp
@@ -1,4 +1,4 @@
# Valgrind suppressions file for UnitE.
# Valgrind suppressions file for Unit-e.
#
# Includes known Valgrind warnings in our dependencies that cannot be fixed
# in-tree.
Expand Down
4 changes: 2 additions & 2 deletions contrib/verifybinaries/README.md
Expand Up @@ -5,10 +5,10 @@
Make sure you obtain the proper release signing key and verify the fingerprint with several independent sources.

```sh
$ gpg --fingerprint "UnitE Core binary release signing key"
$ gpg --fingerprint "unit-e binary release signing key"
pub 4096R/36C2E964 2015-06-24 [expires: 2017-02-13]
Key fingerprint = 01EA 5486 DE18 A882 D4C2 6845 90C8 019E 36C2 E964
uid Wladimir J. van der Laan (UnitE Core binary release signing key) <laanwj@gmail.com>
uid Wladimir J. van der Laan (unit-e binary release signing key) <laanwj@gmail.com>
```

#### Usage:
Expand Down
2 changes: 1 addition & 1 deletion contrib/verifybinaries/verify.sh
Expand Up @@ -123,7 +123,7 @@ if [ $RET -ne 0 ]; then
echo "Bad signature."
elif [ $RET -eq 2 ]; then
#or if a gpg error has occurred
echo "gpg error. Do you have the UnitE Core binary release signing key installed?"
echo "gpg error. Do you have the unit-e binary release signing key installed?"
fi

echo "gpg output:"
Expand Down
2 changes: 1 addition & 1 deletion contrib/zmq/zmq_sub.py
Expand Up @@ -6,7 +6,7 @@
"""
ZMQ example using python3's asyncio
UnitE should be started with the command line arguments:
Unit-e should be started with the command line arguments:
united -testnet -daemon \
-zmqpubrawtx=tcp://127.0.0.1:27181 \
-zmqpubrawblock=tcp://127.0.0.1:27181 \
Expand Down
2 changes: 1 addition & 1 deletion contrib/zmq/zmq_sub3.4.py
Expand Up @@ -6,7 +6,7 @@
"""
ZMQ example using python3's asyncio
UnitE should be started with the command line arguments:
Unit-e should be started with the command line arguments:
united -testnet -daemon \
-zmqpubrawtx=tcp://127.0.0.1:27181 \
-zmqpubrawblock=tcp://127.0.0.1:27181 \
Expand Down
2 changes: 1 addition & 1 deletion doc/man/unite-cli.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH UNITE-CLI "1" "September 2018" "unite-cli v0.16.3.0" "User Commands"
.TH UNIT-E-CLI "1" "September 2018" "unite-cli v0.16.3.0" "User Commands"
.SH NAME
unite-cli \- manual page for unite-cli v0.16.3.0
.SH DESCRIPTION
Expand Down
6 changes: 3 additions & 3 deletions doc/man/unite-tx.1
@@ -1,16 +1,16 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH UNITE-TX "1" "September 2018" "unite-tx v0.16.3.0" "User Commands"
.TH UNIT-E-TX "1" "September 2018" "unite-tx v0.16.3.0" "User Commands"
.SH NAME
unite-tx \- manual page for unite-tx v0.16.3.0
.SH DESCRIPTION
unit-e unite\-tx utility version v0.16.3.0
.SS "Usage:"
.TP
unite\-tx [options] <hex\-tx> [commands]
Update hex\-encoded unite transaction
Update hex\-encoded Unit-e transaction
.TP
unite\-tx [options] \fB\-create\fR [commands]
Create hex\-encoded unite transaction
Create hex\-encoded Unit-e transaction
.SH OPTIONS
.HP
\-?
Expand Down
2 changes: 1 addition & 1 deletion libuniteconsensus.pc.in
Expand Up @@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@

Name: @PACKAGE_NAME@ consensus library
Description: Library for the UnitE consensus protocol.
Description: Library for the Unit-e consensus protocol.
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -luniteconsensus
Cflags: -I${includedir}
Expand Down
6 changes: 3 additions & 3 deletions share/setup.nsi.in
Expand Up @@ -50,9 +50,9 @@ Var StartMenuGroup
# Installer attributes
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
!if "@WINDOWS_BITS@" == "64"
InstallDir $PROGRAMFILES64\UnitE
InstallDir $PROGRAMFILES64\Unit-e
!else
InstallDir $PROGRAMFILES\UnitE
InstallDir $PROGRAMFILES\Unit-e
!endif
CRCCheck on
XPStyle on
Expand Down Expand Up @@ -107,7 +107,7 @@ Section -un.post UNSEC0001
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk"
Delete /REBOOTOK "$SMSTARTUP\UnitE.lnk"
Delete /REBOOTOK "$SMSTARTUP\Unit-e.lnk"
Delete /REBOOTOK $INSTDIR\uninstall.exe
Delete /REBOOTOK $INSTDIR\debug.log
Delete /REBOOTOK $INSTDIR\db.log
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Expand Up @@ -74,7 +74,7 @@ if BUILD_UNITE_UTILS
endif

.PHONY: FORCE check-symbols check-security
# unite core #
# unit-e #
UNITE_CORE_H = \
addrdb.h \
addrman.h \
Expand Down
2 changes: 1 addition & 1 deletion src/amount.h
Expand Up @@ -17,7 +17,7 @@ static const CAmount EEES = 1000000;

/** No amount larger than this (in satoshi) is valid.
*
* Note that this constant is *not* the total money supply, which in UnitE
* Note that this constant is *not* the total money supply, which in Unit-e
* currently happens to be less than 2,718,275,100 UTE for various reasons, but
* rather a sanity check. As this sanity check is used by consensus-critical
* validation code, the exact value of the MAX_MONEY constant is consensus
Expand Down
2 changes: 1 addition & 1 deletion src/arith_uint256.h
Expand Up @@ -278,7 +278,7 @@ class arith_uint256 : public base_uint<256> {
* Thus 0x1234560000 is compact (0x05123456)
* and 0xc0de000000 is compact (0x0600c0de)
*
* UnitE only uses this "compact" format for encoding difficulty
* Unit-e only uses this "compact" format for encoding difficulty
* targets, which are unsigned 256bit quantities. Thus, all the
* complexities of the sign bit and using base 256 are probably an
* implementation accident.
Expand Down
2 changes: 1 addition & 1 deletion src/base58.cpp
Expand Up @@ -271,7 +271,7 @@ CTxDestination DecodeDestination(const std::string& str, const blockchain::Behav
std::vector<unsigned char> data;
uint160 hash;
if (DecodeBase58Check(str, data)) {
// base58-encoded UnitE addresses.
// base58-encoded Unit-e addresses.
// Public-key-hash-addresses have version 0 (or 111 testnet).
// The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
const std::vector<unsigned char>& pubkey_prefix = params.GetBase58Prefix(blockchain::Base58Type::PUBKEY_ADDRESS);
Expand Down
2 changes: 1 addition & 1 deletion src/chainparams.h
Expand Up @@ -35,7 +35,7 @@ struct ChainTxData {

/**
* CChainParams defines various tweakable parameters of a given instance of the
* UnitE system. There are two: the public test network which gets reset from time to
* Unit-e system. There are two: the public test network which gets reset from time to
* time and a regression test mode which is intended for private networks only. It has
* minimal difficulty to ensure that blocks can be found instantly.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/chainparamsbase.h
Expand Up @@ -11,7 +11,7 @@

/**
* CBaseChainParams defines the base parameters (shared between unite-cli and united)
* of a given instance of the UnitE system.
* of a given instance of the Unit-e system.
*/
class CBaseChainParams
{
Expand Down
2 changes: 1 addition & 1 deletion src/consensus/merkle.cpp
Expand Up @@ -101,7 +101,7 @@ static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot
bool matchh = matchlevel == level;
while (count != (((uint32_t)1) << level)) {
// If we reach this point, h is an inner value that is not the top.
// We combine it with itself (UnitE's special rule for odd levels in
// We combine it with itself (Unit-e's special rule for odd levels in
// the tree) to produce a higher level one.
if (pbranch && matchh) {
pbranch->push_back(h);
Expand Down
4 changes: 2 additions & 2 deletions src/hash.h
Expand Up @@ -17,7 +17,7 @@

typedef uint256 ChainCode;

/** A hasher class for UnitE's 256-bit hash (double SHA-256). */
/** A hasher class for Unit-e's 256-bit hash (double SHA-256). */
class CHash256 {
private:
CSHA256 sha;
Expand All @@ -41,7 +41,7 @@ class CHash256 {
}
};

/** A hasher class for UnitE's 160-bit hash (SHA-256 + RIPEMD-160). */
/** A hasher class for Unit-e's 160-bit hash (SHA-256 + RIPEMD-160). */
class CHash160 {
private:
CSHA256 sha;
Expand Down
4 changes: 2 additions & 2 deletions src/init.cpp
Expand Up @@ -740,7 +740,7 @@ void ThreadImport(std::vector<fs::path> vImportFiles)
}

/** Sanity checks
* Ensure that UnitE is running in a usable environment with all
* Ensure that Unit-e is running in a usable environment with all
* necessary library support.
*/
bool InitSanityCheck(void)
Expand Down Expand Up @@ -1248,7 +1248,7 @@ bool AppInitParameterInteraction()

static bool LockDataDirectory(bool probeOnly)
{
// Make sure only a single UnitE process is using the data directory.
// Make sure only a single Unit-e process is using the data directory.
fs::path datadir = GetDataDir();
if (!LockDirectory(datadir, ".lock", probeOnly)) {
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), datadir.string(), _(PACKAGE_NAME)));
Expand Down
6 changes: 3 additions & 3 deletions src/init.h
Expand Up @@ -26,7 +26,7 @@ void InitLogging();
//!Parameter interaction: change current parameters depending on various rules
void InitParameterInteraction();

/** Initialize unite core: Basic context setup.
/** Initialize unit-e: Basic context setup.
* @note This can be done before daemonization. Do not call Shutdown() if this function fails.
* @pre Parameters should be parsed and config file should be read.
*/
Expand All @@ -44,13 +44,13 @@ bool AppInitParameterInteraction();
*/
bool AppInitSanityChecks();
/**
* Lock unite core data directory.
* Lock unit-e data directory.
* @note This should only be done after daemonization. Do not call Shutdown() if this function fails.
* @pre Parameters should be parsed and config file should be read, AppInitSanityChecks should have been called.
*/
bool AppInitLockDataDirectory();
/**
* UnitE core main initialization.
* unit-e main initialization.
* @note This should only be done after daemonization. Call Shutdown() if this function fails.
* @pre Parameters should be parsed and config file should be read, AppInitLockDataDirectory should have been called.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/key.cpp
Expand Up @@ -209,7 +209,7 @@ bool CKey::VerifyPubKey(const CPubKey& pubkey) const {
return false;
}
unsigned char rnd[8];
std::string str = "UnitE key verification\n";
std::string str = "Unit-e key verification\n";
GetRandBytes(rnd, sizeof(rnd));
uint256 hash;
CHash256().Write((unsigned char*)str.data(), str.size()).Write(rnd, sizeof(rnd)).Finalize(hash.begin());
Expand Down

0 comments on commit 0742841

Please sign in to comment.