Skip to content

Commit 80f0b82

Browse files
committed
cleanup: name
1 parent 5b0473b commit 80f0b82

File tree

7 files changed

+24
-104
lines changed

7 files changed

+24
-104
lines changed

docs/RELEASE_CHECKLIST.md

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/common/dns_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ std::string address_from_txt_record(const std::string &s) {
424424
*
425425
* gets the scala address from the TXT record of the DNS entry associated
426426
* with <url>. If this lookup fails, or the TXT record does not contain an
427-
* XMR address in the correct format, returns an empty string. <dnssec_valid>
427+
* XLA address in the correct format, returns an empty string. <dnssec_valid>
428428
* will be set true or false according to whether or not the DNS query passes
429429
* DNSSEC validation.
430430
*

src/cryptonote_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
// New constants are intended to go here
221221
namespace config
222222
{
223-
uint64_t const DEFAULT_FEE_ATOMIC_XMR_PER_KB = 500; // Just a placeholder! Change me!
223+
uint64_t const DEFAULT_FEE_ATOMIC_XLA_PER_KB = 500; // Just a placeholder! Change me!
224224
uint8_t const FEE_CALCULATION_MAX_RETRIES = 10;
225225
uint64_t const DEFAULT_DUST_THRESHOLD = ((uint64_t)2000000000); // 2 * pow(10, 9)
226226
uint64_t const BASE_REWARD_CLAMP_THRESHOLD = ((uint64_t)100000000); // pow(10, 8)

src/simplewallet/simplewallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2838,7 +2838,7 @@ bool simple_wallet::help(
28382838
message_writer() << tr("\"address all\" - Show all addresses.");
28392839
message_writer() << tr("\"address new\" - Create new subaddress.");
28402840
message_writer() << tr(
2841-
"\"transfer <address> <amount>\" - Send XMR to an address.");
2841+
"\"transfer <address> <amount>\" - Send XLA to an address.");
28422842
message_writer() << tr(
28432843
"\"show_transfers [in|out|pending|failed|pool]\" - Show transactions.");
28442844
message_writer() << tr(
@@ -2852,7 +2852,7 @@ bool simple_wallet::help(
28522852
message_writer() << tr("\"exit\" - Exit wallet.");
28532853
message_writer() << "";
28542854
message_writer() << tr(
2855-
"\"donate <amount>\" - Donate XMR to the development team.");
2855+
"\"donate <amount>\" - Donate XLA to the development team.");
28562856
message_writer() << "";
28572857
} else if ((args.size() == 1) && (args.front() == "all")) {
28582858
success_msg_writer() << get_commands_str();

src/wallet/api/transaction_history.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void TransactionHistoryImpl::refresh()
127127
// - payment_details - input transfers
128128

129129
// payments are "input transactions";
130-
// one input transaction contains only one transfer. e.g. <transaction_id> - <100XMR>
130+
// one input transaction contains only one transfer. e.g. <transaction_id> - <100XLA>
131131

132132
std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> in_payments;
133133
m_wallet->m_wallet->get_payments(in_payments, min_height, max_height);
@@ -158,8 +158,8 @@ void TransactionHistoryImpl::refresh()
158158
// confirmed output transactions
159159
// one output transaction may contain more than one money transfer, e.g.
160160
// <transaction_id>:
161-
// transfer1: 100XMR to <address_1>
162-
// transfer2: 50XMR to <address_2>
161+
// transfer1: 100XLA to <address_1>
162+
// transfer2: 50XLA to <address_2>
163163
// fee: fee charged per transaction
164164
//
165165

tests/data/sha256sum/small_file.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ While scala shares some of the core attributes of Bitcoin that enable circular e
88
scala users do not need to worry about mass surveillance or even targeted censorship of their transactions, enabling unique peace of mind and preventing any burdens on commerce. You can transact with anyone in the world, at any time, without any surveillance using the scala wallet of your choice.
99

1010
2. Fungibility removes the risk of tainted coins and ensures trust
11-
As scala is fungible (1 XMR equals 1 XMR, no matter what), participants in the circular economy don’t need to worry about the funds they are sending or receiving. Any scala they send cannot be traced back to their other transactions and has no history and thus cannot be censored based on history, and scala received will always be able to be spent freely at full market value. This fungibility adds to the peace of mind of participants, ensures that chain analysis firms cannot force their way into circular economies, and prevents a breakdown of trust in scala as a method of exchange.
11+
As scala is fungible (1 XLA equals 1 XLA, no matter what), participants in the circular economy don’t need to worry about the funds they are sending or receiving. Any scala they send cannot be traced back to their other transactions and has no history and thus cannot be censored based on history, and scala received will always be able to be spent freely at full market value. This fungibility adds to the peace of mind of participants, ensures that chain analysis firms cannot force their way into circular economies, and prevents a breakdown of trust in scala as a method of exchange.
1212
The current breakdown of trust in Bitcoin as a method of exchange is leading to it rapidly losing traction in circular economies where scala is present. People don’t want to have to check funds for taint, worry about if they will be able to spend them freely, or feel the need to use any chain analysis tools to protect themselves from legal or regulatory issues.
1313

1414
3. scala’s low fees ensure a free flow of commerce

tests/libwallet_api_tests/main.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ const char * TESTNET_WALLET_PASS = "";
8282
std::string CURRENT_SRC_WALLET;
8383
std::string CURRENT_DST_WALLET;
8484

85-
const uint64_t AMOUNT_10XMR = 10000000000000L;
86-
const uint64_t AMOUNT_5XMR = 5000000000000L;
87-
const uint64_t AMOUNT_1XMR = 1000000000000L;
85+
const uint64_t AMOUNT_10XLA = 10000000000000L;
86+
const uint64_t AMOUNT_5XLA = 5000000000000L;
87+
const uint64_t AMOUNT_1XLA = 1000000000000L;
8888

8989
const std::string PAYMENT_ID_EMPTY = "";
9090

@@ -553,12 +553,12 @@ TEST_F(WalletTest1, WalletRefresh)
553553

554554
TEST_F(WalletTest1, WalletConvertsToString)
555555
{
556-
std::string strAmount = scala::Wallet::displayAmount(AMOUNT_5XMR);
557-
ASSERT_TRUE(AMOUNT_5XMR == scala::Wallet::amountFromString(strAmount));
556+
std::string strAmount = scala::Wallet::displayAmount(AMOUNT_5XLA);
557+
ASSERT_TRUE(AMOUNT_5XLA == scala::Wallet::amountFromString(strAmount));
558558

559-
ASSERT_TRUE(AMOUNT_5XMR == scala::Wallet::amountFromDouble(5.0));
560-
ASSERT_TRUE(AMOUNT_10XMR == scala::Wallet::amountFromDouble(10.0));
561-
ASSERT_TRUE(AMOUNT_1XMR == scala::Wallet::amountFromDouble(1.0));
559+
ASSERT_TRUE(AMOUNT_5XLA == scala::Wallet::amountFromDouble(5.0));
560+
ASSERT_TRUE(AMOUNT_10XLA == scala::Wallet::amountFromDouble(10.0));
561+
ASSERT_TRUE(AMOUNT_1XLA == scala::Wallet::amountFromDouble(1.0));
562562

563563
}
564564

@@ -580,7 +580,7 @@ TEST_F(WalletTest1, WalletTransaction)
580580

581581
scala::PendingTransaction * transaction = wallet1->createTransaction(recepient_address,
582582
PAYMENT_ID_EMPTY,
583-
AMOUNT_10XMR,
583+
AMOUNT_10XLA,
584584
MIXIN_COUNT,
585585
scala::PendingTransaction::Priority_Medium,
586586
0,
@@ -589,7 +589,7 @@ TEST_F(WalletTest1, WalletTransaction)
589589
wallet1->refresh();
590590

591591
ASSERT_TRUE(wallet1->balance(0) == balance);
592-
ASSERT_TRUE(transaction->amount() == AMOUNT_10XMR);
592+
ASSERT_TRUE(transaction->amount() == AMOUNT_10XLA);
593593
ASSERT_TRUE(transaction->commit());
594594
ASSERT_FALSE(wallet1->balance(0) == balance);
595595
ASSERT_TRUE(wmgr->closeWallet(wallet1));
@@ -623,7 +623,7 @@ TEST_F(WalletTest1, WalletTransactionWithMixin)
623623
std::cerr << "Transaction mixin count: " << mixin << std::endl;
624624

625625
scala::PendingTransaction * transaction = wallet1->createTransaction(
626-
recepient_address, payment_id, AMOUNT_5XMR, mixin, scala::PendingTransaction::Priority_Medium, 0, std::set<uint32_t>{});
626+
recepient_address, payment_id, AMOUNT_5XLA, mixin, scala::PendingTransaction::Priority_Medium, 0, std::set<uint32_t>{});
627627

628628
std::cerr << "Transaction status: " << transaction->status() << std::endl;
629629
std::cerr << "Transaction fee: " << scala::Wallet::displayAmount(transaction->fee()) << std::endl;
@@ -665,7 +665,7 @@ TEST_F(WalletTest1, WalletTransactionWithPriority)
665665
std::cerr << "Transaction priority: " << *it << std::endl;
666666

667667
scala::PendingTransaction * transaction = wallet1->createTransaction(
668-
recepient_address, payment_id, AMOUNT_5XMR, mixin, *it, 0, std::set<uint32_t>{});
668+
recepient_address, payment_id, AMOUNT_5XLA, mixin, *it, 0, std::set<uint32_t>{});
669669
std::cerr << "Transaction status: " << transaction->status() << std::endl;
670670
std::cerr << "Transaction fee: " << scala::Wallet::displayAmount(transaction->fee()) << std::endl;
671671
std::cerr << "Transaction error: " << transaction->errorString() << std::endl;
@@ -721,7 +721,7 @@ TEST_F(WalletTest1, WalletTransactionAndHistory)
721721

722722
scala::PendingTransaction * tx = wallet_src->createTransaction(wallet4_addr,
723723
PAYMENT_ID_EMPTY,
724-
AMOUNT_10XMR * 5, 1, scala::PendingTransaction::Priority_Medium, 0, std::set<uint32_t>{});
724+
AMOUNT_10XLA * 5, 1, scala::PendingTransaction::Priority_Medium, 0, std::set<uint32_t>{});
725725

726726
ASSERT_TRUE(tx->status() == scala::PendingTransaction::Status_Ok);
727727
ASSERT_TRUE(tx->commit());
@@ -763,7 +763,7 @@ TEST_F(WalletTest1, WalletTransactionWithPaymentId)
763763

764764
scala::PendingTransaction * tx = wallet_src->createTransaction(wallet4_addr,
765765
payment_id,
766-
AMOUNT_1XMR, 1, scala::PendingTransaction::Priority_Medium, 0, std::set<uint32_t>{});
766+
AMOUNT_1XLA, 1, scala::PendingTransaction::Priority_Medium, 0, std::set<uint32_t>{});
767767

768768
ASSERT_TRUE(tx->status() == scala::PendingTransaction::Status_Ok);
769769
ASSERT_TRUE(tx->commit());
@@ -930,7 +930,7 @@ TEST_F(WalletTest2, WalletCallbackSent)
930930
std::cout << "** Balance: " << wallet_src->displayAmount(wallet_src->balance(0)) << std::endl;
931931
scala::Wallet * wallet_dst = wmgr->openWallet(CURRENT_DST_WALLET, TESTNET_WALLET_PASS, scala::NetworkType::TESTNET);
932932

933-
uint64_t amount = AMOUNT_1XMR * 5;
933+
uint64_t amount = AMOUNT_1XLA * 5;
934934
std::cout << "** Sending " << scala::Wallet::displayAmount(amount) << " to " << wallet_dst->mainAddress();
935935

936936

@@ -973,7 +973,7 @@ TEST_F(WalletTest2, WalletCallbackReceived)
973973
std::cout << "** Balance dst1: " << wallet_dst->displayAmount(wallet_dst->balance(0)) << std::endl;
974974
std::unique_ptr<MyWalletListener> wallet_dst_listener (new MyWalletListener(wallet_dst));
975975

976-
uint64_t amount = AMOUNT_1XMR * 5;
976+
uint64_t amount = AMOUNT_1XLA * 5;
977977
std::cout << "** Sending " << scala::Wallet::displayAmount(amount) << " to " << wallet_dst->mainAddress();
978978
scala::PendingTransaction * tx = wallet_src->createTransaction(wallet_dst->mainAddress(),
979979
PAYMENT_ID_EMPTY,

0 commit comments

Comments
 (0)