fix: temporarily alias database_url for backwards compatibility

crates/ilp-node/src/main.rs

@@ -74,8 +74,8 @@ pub fn main() {
             .help("HTTP Authorization token for the node admin (sent as a Bearer token)"),
         Arg::with_name("database_url")
             .long("database_url")
-            // XXX: we'd uncomment the following if we want to provide temporary backwards compatibility
-            //.alias("redis_url")
+            // temporary alias for backwards compatibility
+            .alias("redis_url")
             .takes_value(true)
             .default_value("redis://127.0.0.1:6379")
             .help("Redis URI (for example, \"redis://127.0.0.1:6379\" or \"unix:/tmp/redis.sock\")"),

crates/ilp-node/src/node.rs

@@ -201,8 +201,8 @@ pub struct InterledgerNode {
     /// Data store URI (for example, "redis://127.0.0.1:6379" or "redis+unix:/tmp/redis.sock")
     #[serde(
         default = "default_database_url",
-        // XXX: we'd uncomment the following if we want to provide temporary backwards compatibility
-        //alias = "redis_url"
+        // temporary alias for backwards compatibility
+        alias = "redis_url"
     )]
     pub database_url: String,
     /// IP address and port to listen for HTTP connections

docker/run-testnet-bundle.js

@@ -130,7 +130,7 @@ function runNode({ httpBindAddress, adminAuthToken, secretSeed, nodeName }) {
         `--http_bind_address=${httpBindAddress}`,
         `--admin_auth_token=${adminAuthToken}`,
         `--secret_seed=${secretSeed}`,
-        '--database_url=redis+unix:/tmp/redis.sock',
+        '--redis_url=redis+unix:/tmp/redis.sock',
         `--default_spsp_account=${nodeName}`
     ],
         {
@@ -170,7 +170,7 @@ function runEthSettlementEngine({ ethKey, ethUrl }) {
         `--private_key=${ethKey}`,
         '--poll_frequency=15000',
         '--confirmations=0',
-        '--database_url=redis+unix:/tmp/redis.sock?db=2',
+        '--redis_url=redis+unix:/tmp/redis.sock?db=2',
         '--chain_id=4'
     ], {
         env: {

docs/manual-config.md

@@ -161,7 +161,7 @@ cargo run --bin ilp-settlement-ethereum -- \
 --poll_frequency 15000 \
 --ethereum_url "${SE_ETH_URL}" \
 --connector_url http://127.0.0.1:7771 \
---database_url redis://127.0.0.1:6380/ \
+--redis_url redis://127.0.0.1:6380/ \
 --settlement_api_bind_address 127.0.0.1:3000 \
 &> logs/settlement-engine-eth.log &
 ```

examples/eth-settlement/README.md

@@ -341,7 +341,7 @@ ilp-settlement-ethereum \
 --poll_frequency 1000 \
 --ethereum_url http://127.0.0.1:8545 \
 --connector_url http://127.0.0.1:7771 \
---database_url redis://127.0.0.1:6380/ \
+--redis_url redis://127.0.0.1:6380/ \
 --settlement_api_bind_address 127.0.0.1:3000 \
 &> logs/node-alice-settlement-engine.log &
 
@@ -352,7 +352,7 @@ ilp-settlement-ethereum \
 --poll_frequency 1000 \
 --ethereum_url http://127.0.0.1:8545 \
 --connector_url http://127.0.0.1:8771 \
---database_url redis://127.0.0.1:6382/ \
+--redis_url redis://127.0.0.1:6382/ \
 --settlement_api_bind_address 127.0.0.1:3001 \
 &> logs/node-bob-settlement-engine.log &
 ```
@@ -380,7 +380,7 @@ ilp-node \
 --ilp_address example.alice \
 --secret_seed 8852500887504328225458511465394229327394647958135038836332350604 \
 --admin_auth_token hi_alice \
---database_url redis://127.0.0.1:6379/ \
+--redis_url redis://127.0.0.1:6379/ \
 --http_bind_address 127.0.0.1:7770 \
 --settlement_api_bind_address 127.0.0.1:7771 \
 &> logs/node-alice.log &
@@ -390,7 +390,7 @@ ilp-node \
 --ilp_address example.bob \
 --secret_seed 1604966725982139900555208458637022875563691455429373719368053354 \
 --admin_auth_token hi_bob \
---database_url redis://127.0.0.1:6381/ \
+--redis_url redis://127.0.0.1:6381/ \
 --http_bind_address 127.0.0.1:8770 \
 --settlement_api_bind_address 127.0.0.1:8771 \
 &> logs/node-bob.log &

examples/eth-xrp-three-nodes/README.md

@@ -378,7 +378,7 @@ ilp-settlement-ethereum \
 --poll_frequency 1000 \
 --ethereum_url http://127.0.0.1:8545 \
 --connector_url http://127.0.0.1:7771 \
---database_url redis://127.0.0.1:6380/ \
+--redis_url redis://127.0.0.1:6380/ \
 --asset_scale 6 \
 --settlement_api_bind_address 127.0.0.1:3000 \
 &> logs/node-alice-settlement-engine-eth.log &
@@ -390,7 +390,7 @@ ilp-settlement-ethereum \
 --poll_frequency 1000 \
 --ethereum_url http://127.0.0.1:8545 \
 --connector_url http://127.0.0.1:8771 \
---database_url redis://127.0.0.1:6382/ \
+--redis_url redis://127.0.0.1:6382/ \
 --asset_scale 6 \
 --settlement_api_bind_address 127.0.0.1:3001 \
 &> logs/node-bob-settlement-engine-eth.log &
@@ -434,7 +434,7 @@ ilp-node \
 --ilp_address example.alice \
 --secret_seed 8852500887504328225458511465394229327394647958135038836332350604 \
 --admin_auth_token hi_alice \
---database_url redis://127.0.0.1:6379/ \
+--redis_url redis://127.0.0.1:6379/ \
 --http_bind_address 127.0.0.1:7770 \
 --settlement_api_bind_address 127.0.0.1:7771 \
 &> logs/node-alice.log &
@@ -444,7 +444,7 @@ ilp-node \
 --ilp_address example.bob \
 --secret_seed 1604966725982139900555208458637022875563691455429373719368053354 \
 --admin_auth_token hi_bob \
---database_url redis://127.0.0.1:6381/ \
+--redis_url redis://127.0.0.1:6381/ \
 --http_bind_address 127.0.0.1:8770 \
 --settlement_api_bind_address 127.0.0.1:8771 \
 &> logs/node-bob.log &
@@ -457,7 +457,7 @@ ilp-node \
 ilp-node \
 --secret_seed 1232362131122139900555208458637022875563691455429373719368053354 \
 --admin_auth_token hi_charlie \
---database_url redis://127.0.0.1:6384/ \
+--redis_url redis://127.0.0.1:6384/ \
 --http_bind_address 127.0.0.1:9770 \
 --settlement_api_bind_address 127.0.0.1:9771 \
 &> logs/node-charlie.log &

examples/simple/README.md

@@ -215,7 +215,7 @@ ilp-node \
 --ilp_address example.node_a \
 --secret_seed 8852500887504328225458511465394229327394647958135038836332350604 \
 --admin_auth_token admin-a \
---database_url redis://127.0.0.1:6379/ \
+--redis_url redis://127.0.0.1:6379/ \
 --http_bind_address 127.0.0.1:7770 \
 --settlement_api_bind_address 127.0.0.1:7771 \
 &> logs/node_a.log &
@@ -224,7 +224,7 @@ ilp-node \
 --ilp_address example.node_b \
 --secret_seed 1604966725982139900555208458637022875563691455429373719368053354 \
 --admin_auth_token admin-b \
---database_url redis://127.0.0.1:6380/ \
+--redis_url redis://127.0.0.1:6380/ \
 --http_bind_address 127.0.0.1:8770 \
 --settlement_api_bind_address 127.0.0.1:8771 \
 &> logs/node_b.log &

examples/xrp-settlement/README.md

@@ -273,7 +273,7 @@ ilp-node \
 --ilp_address example.alice \
 --secret_seed 8852500887504328225458511465394229327394647958135038836332350604 \
 --admin_auth_token hi_alice \
---database_url redis://127.0.0.1:6379/ \
+--redis_url redis://127.0.0.1:6379/ \
 --http_bind_address 127.0.0.1:7770 \
 --settlement_api_bind_address 127.0.0.1:7771 \
 &> logs/node-alice.log &
@@ -283,7 +283,7 @@ ilp-node \
 --ilp_address example.bob \
 --secret_seed 1604966725982139900555208458637022875563691455429373719368053354 \
 --admin_auth_token hi_bob \
---database_url redis://127.0.0.1:6381/ \
+--redis_url redis://127.0.0.1:6381/ \
 --http_bind_address 127.0.0.1:8770 \
 --settlement_api_bind_address 127.0.0.1:8771 \
 &> logs/node-bob.log &