depolymerization

commit 7fce22cf8134ad6986070ca4ef41fe8a474f81b9
parent 06cbb24cbc316e7c9eb07480198af885f6ba492e
Author: Antoine A <>
Date:   Tue,  8 Mar 2022 11:19:37 +0100

RFC 8905 compatible currency names

Diffstat:
M
README.md
 | 
2
++
M
common/src/currency.rs
 | 
12
++++++------
M
docs/taler-btc.conf
 | 
2
+-
M
docs/taler-eth.conf
 | 
2
+-
M
test/conf/taler_btc.conf
 | 
2
+-
M
test/conf/taler_btc_bump.conf
 | 
2
+-
M
test/conf/taler_btc_lifetime.conf
 | 
2
+-
M
test/conf/taler_eth.conf
 | 
2
+-
M
test/conf/taler_eth_bump.conf
 | 
2
+-
M
test/conf/taler_eth_lifetime.conf
 | 
2
+-

10 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
@@ -96,7 +96,9 @@ BOUNCE_FEE   = 0.00001
 
 ```ini
 [depolymerizer-___]
+# Port on which the server listen
 PORT          = 8080
+# Path on which the server listen (replace port)
 UNIXPATH      =
 ```
 
diff --git a/common/src/currency.rs b/common/src/currency.rs
@@ -16,12 +16,12 @@
 
 use std::str::FromStr;
 
-pub const MAIN_ETH: &str = "ETHEREUM-ETH";
-pub const ROPSTEN_ETH: &str = "TEST-ROPSTEN-ETH";
-pub const DEV_ETH: &str = "DEV-ETH";
-pub const MAIN_BTC: &str = "BITCOIN-BTC";
-pub const REGTEST_BTC: &str = "TEST-BTC";
-pub const TESTNET_BTC: &str = "DEV-BTC";
+pub const MAIN_ETH: &str = "ETHEREUMETH";
+pub const ROPSTEN_ETH: &str = "TESTROPSTENETH";
+pub const DEV_ETH: &str = "DEVETH";
+pub const MAIN_BTC: &str = "BITCOINBTC";
+pub const REGTEST_BTC: &str = "TESTBTC";
+pub const TESTNET_BTC: &str = "DEVBTC";
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Currency {
diff --git a/docs/taler-btc.conf b/docs/taler-btc.conf
@@ -1,6 +1,6 @@
 # Full btc-wire configuration
 [taler]
-CURRENCY      = BITCOIN-BTC
+CURRENCY      = BITCOINBTC
 
 [exchange]
 BASE_URL      = http://test.com
diff --git a/docs/taler-eth.conf b/docs/taler-eth.conf
@@ -1,6 +1,6 @@
 # Full eth-wire configuration
 [taler]
-CURRENCY      = ETHEREUM-ETH
+CURRENCY      = ETHEREUMETH
 
 [exchange]
 BASE_URL      = http://test.com
diff --git a/test/conf/taler_btc.conf b/test/conf/taler_btc.conf
@@ -1,5 +1,5 @@
 [taler]
-CURRENCY     = DEV-BTC
+CURRENCY     = DEVBTC
 
 [exchange]
 BASE_URL     = http://test.com
diff --git a/test/conf/taler_btc_bump.conf b/test/conf/taler_btc_bump.conf
@@ -1,5 +1,5 @@
 [taler]
-CURRENCY      = DEV-BTC
+CURRENCY      = DEVBTC
 
 [exchange]
 BASE_URL      = http://test.com
diff --git a/test/conf/taler_btc_lifetime.conf b/test/conf/taler_btc_lifetime.conf
@@ -1,5 +1,5 @@
 [taler]
-CURRENCY      = DEV-BTC
+CURRENCY      = DEVBTC
 
 [exchange]
 BASE_URL      = http://test.com
diff --git a/test/conf/taler_eth.conf b/test/conf/taler_eth.conf
@@ -1,5 +1,5 @@
 [taler]
-CURRENCY     = DEV-ETH
+CURRENCY     = DEVETH
 
 [exchange]
 BASE_URL     = http://test.com
diff --git a/test/conf/taler_eth_bump.conf b/test/conf/taler_eth_bump.conf
@@ -1,5 +1,5 @@
 [taler]
-CURRENCY     = DEV-ETH
+CURRENCY     = DEVETH
 
 [exchange]
 BASE_URL     = http://test.com
diff --git a/test/conf/taler_eth_lifetime.conf b/test/conf/taler_eth_lifetime.conf
@@ -1,5 +1,5 @@
 [taler]
-CURRENCY      = DEV-ETH
+CURRENCY      = DEVETH
 
 [exchange]
 BASE_URL      = http://test.com