refactor: renamed interledger-store crate in prep for new stores

interledger · Nov 22, 2019 · 9e6d239 · 9e6d239
1 parent 3fe4273
commit 9e6d239
Show file tree

Hide file tree

Showing 38 changed files with 40 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,6 @@ members = [
   "./crates/interledger-service-util",
   "./crates/interledger-settlement",
   "./crates/interledger-spsp",
-  "./crates/interledger-store-redis",
+  "./crates/interledger-store",
   "./crates/interledger-stream",
 ]
diff --git a/crates/ilp-node/Cargo.toml b/crates/ilp-node/Cargo.toml
@@ -26,6 +26,7 @@ lazy_static = { version = "1.4.0", default-features = false }
 metrics = { version = "0.12.0", default-features = false, features = ["std"] }
 metrics-core = { version = "0.5.1", default-features = false }
 metrics-runtime = { version = "0.12.0", default-features = false, features = ["metrics-observer-prometheus"] }
+redis = { version = "0.13.0", default-features = false, features = ["executor"] }
 ring = { version = "0.16.9", default-features = false }
 serde = { version = "1.0.101", default-features = false }
 tokio = { version = "0.1.22", default-features = false }

diff --git a/crates/ilp-node/src/node.rs b/crates/ilp-node/src/node.rs
@@ -33,12 +33,16 @@ use interledger::{
         MaxPacketAmountService, RateLimitService, ValidatorService,
     },
     settlement::api::{create_settlements_filter, SettlementMessageService},
-    store_redis::{Account, AccountId, ConnectionInfo, IntoConnectionInfo, RedisStoreBuilder},
+    store::{
+        account::{Account, AccountId},
+        redis::RedisStoreBuilder,
+    },
     stream::StreamReceiverService,
 };
 use lazy_static::lazy_static;
 use metrics_core::{Builder, Drain, Observe};
 use metrics_runtime;
+use redis::{ConnectionInfo, IntoConnectionInfo};
 use ring::hmac;
 use serde::{de::Error as DeserializeError, Deserialize, Deserializer};
 use std::{convert::TryFrom, net::SocketAddr, str, str::FromStr, time::Duration};

diff --git a/crates/ilp-node/tests/test_helpers.rs b/crates/ilp-node/tests/test_helpers.rs
@@ -4,7 +4,7 @@ use interledger::stream::StreamDelivery;
 use interledger::{
     packet::Address,
     service::Account as AccountTrait,
-    store_redis::{Account, AccountId},
+    store::account::{Account, AccountId},
 };
 use ring::rand::{SecureRandom, SystemRandom};
 use serde::Serialize;

diff --git a/crates/interledger-store-redis/src/lib.rs b/crates/interledger-store-redis/src/lib.rs
diff --git a/crates/interledger-store-redis/Cargo.toml → crates/interledger-store/Cargo.toml b/crates/interledger-store-redis/Cargo.toml → crates/interledger-store/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "interledger-store-redis"
+name = "interledger-store"
 version = "0.4.0"
 authors = ["Evan Schwartz <evan@ripple.com>"]
-description = "Data store for Interledger.js using Redis"
+description = "Data stores for Interledger.rs"
 license = "Apache-2.0"
 edition = "2018"
 repository = "https://github.com/interledger-rs/interledger-rs"
 
 [lib]
-name = "interledger_store_redis"
+name = "interledger_store"
 path = "src/lib.rs"
 
 [dependencies]

diff --git a/crates/interledger-store-redis/README.md → crates/interledger-store/README.md b/crates/interledger-store-redis/README.md → crates/interledger-store/README.md
diff --git a/...-store-redis/external/libredis_cell.dylib → ...ledger-store/external/libredis_cell.dylib b/...-store-redis/external/libredis_cell.dylib → ...ledger-store/external/libredis_cell.dylib
diff --git a/...ger-store-redis/external/libredis_cell.so → ...terledger-store/external/libredis_cell.so b/...ger-store-redis/external/libredis_cell.so → ...terledger-store/external/libredis_cell.so
diff --git a/...nterledger-store-redis/redis-example.conf → crates/interledger-store/redis-example.conf b/...nterledger-store-redis/redis-example.conf → crates/interledger-store/redis-example.conf
diff --git a/...es/interledger-store-redis/src/account.rs → crates/interledger-store/src/account.rs b/...es/interledger-store-redis/src/account.rs → crates/interledger-store/src/account.rs
diff --git a/crates/interledger-store-redis/src/crypto.rs → crates/interledger-store/src/crypto.rs b/crates/interledger-store-redis/src/crypto.rs → crates/interledger-store/src/crypto.rs
diff --git a/crates/interledger-store/src/lib.rs b/crates/interledger-store/src/lib.rs
@@ -0,0 +1,7 @@
+//! # interledger-store
+//!
+//! Backend databases for storing account details, balances, the routing table, etc.
+
+pub mod account;
+pub mod crypto;
+pub mod redis;
diff --git a/...e-redis/src/lua/account_from_username.lua → ...e/src/redis/lua/account_from_username.lua b/...e-redis/src/lua/account_from_username.lua → ...e/src/redis/lua/account_from_username.lua
diff --git a/...ger-store-redis/src/lua/load_accounts.lua → ...ger-store/src/redis/lua/load_accounts.lua b/...ger-store-redis/src/lua/load_accounts.lua → ...ger-store/src/redis/lua/load_accounts.lua
diff --git a/...r-store-redis/src/lua/process_fulfill.lua → ...r-store/src/redis/lua/process_fulfill.lua b/...r-store-redis/src/lua/process_fulfill.lua → ...r-store/src/redis/lua/process_fulfill.lua
diff --git a/...s/src/lua/process_incoming_settlement.lua → ...redis/lua/process_incoming_settlement.lua b/...s/src/lua/process_incoming_settlement.lua → ...redis/lua/process_incoming_settlement.lua
diff --git a/...r-store-redis/src/lua/process_prepare.lua → ...r-store/src/redis/lua/process_prepare.lua b/...r-store-redis/src/lua/process_prepare.lua → ...r-store/src/redis/lua/process_prepare.lua
diff --git a/...er-store-redis/src/lua/process_reject.lua → ...er-store/src/redis/lua/process_reject.lua b/...er-store-redis/src/lua/process_reject.lua → ...er-store/src/redis/lua/process_reject.lua
diff --git a/...store-redis/src/lua/refund_settlement.lua → ...store/src/redis/lua/refund_settlement.lua b/...store-redis/src/lua/refund_settlement.lua → ...store/src/redis/lua/refund_settlement.lua
diff --git a/crates/interledger-store-redis/src/store.rs → crates/interledger-store/src/redis/mod.rs b/crates/interledger-store-redis/src/store.rs → crates/interledger-store/src/redis/mod.rs
@@ -14,10 +14,11 @@
 //    smembers <key>        list the members of a set
 //    get <key>             get the value of a key
 //    hgetall <key>         the flattened list of every key/value entry within a hash
+mod reconnect;
+use reconnect::RedisReconnect;
 
-use super::account::*;
+use super::account::{Account, AccountId, AccountWithEncryptedTokens};
 use super::crypto::{encrypt_token, generate_keys, DecryptionKey, EncryptionKey};
-use super::reconnect::RedisReconnect;
 use bytes::Bytes;
 use futures::{
     future::{err, ok, result, Either},
@@ -27,7 +28,6 @@ use futures::{
 use log::{debug, error, trace, warn};
 use std::collections::{HashMap, HashSet};
 
-use super::account::AccountId;
 use http::StatusCode;
 use interledger_api::{AccountDetails, AccountSettings, EncryptedAccountSettings, NodeStore};
 use interledger_btp::BtpStore;

diff --git a/.../interledger-store-redis/src/reconnect.rs → .../interledger-store/src/redis/reconnect.rs b/.../interledger-store-redis/src/reconnect.rs → .../interledger-store/src/redis/reconnect.rs
diff --git a/...ledger-store-redis/tests/accounts_test.rs → .../interledger-store/tests/accounts_test.rs b/...ledger-store-redis/tests/accounts_test.rs → .../interledger-store/tests/accounts_test.rs
@@ -11,7 +11,7 @@ use interledger_packet::Address;
 use interledger_service::Account as AccountTrait;
 use interledger_service::{AccountStore, AddressStore, Username};
 use interledger_service_util::BalanceStore;
-use interledger_store_redis::AccountId;
+use interledger_store::account::AccountId;
 use log::{debug, error};
 use redis::Client;
 use secrecy::SecretString;

diff --git a/...ledger-store-redis/tests/balances_test.rs → .../interledger-store/tests/balances_test.rs b/...ledger-store-redis/tests/balances_test.rs → .../interledger-store/tests/balances_test.rs
@@ -9,7 +9,7 @@ use interledger_service_util::BalanceStore;
 use std::str::FromStr;
 
 use interledger_service::{Account as AccountTrait, AddressStore};
-use interledger_store_redis::AccountId;
+use interledger_store::account::{Account, AccountId};
 
 #[test]
 fn get_balance() {

diff --git a/...interledger-store-redis/tests/btp_test.rs → crates/interledger-store/tests/btp_test.rs b/...interledger-store-redis/tests/btp_test.rs → crates/interledger-store/tests/btp_test.rs
diff --git a/...dger-store-redis/tests/common/fixtures.rs → ...nterledger-store/tests/common/fixtures.rs b/...dger-store-redis/tests/common/fixtures.rs → ...nterledger-store/tests/common/fixtures.rs
diff --git a/...terledger-store-redis/tests/common/mod.rs → crates/interledger-store/tests/common/mod.rs b/...terledger-store-redis/tests/common/mod.rs → crates/interledger-store/tests/common/mod.rs
@@ -4,6 +4,6 @@ mod store_helpers;
 
 pub use fixtures::*;
 pub use futures::Future;
-pub use interledger_store_redis::*;
+pub use interledger_store::redis::*;
 pub use redis_helpers::*;
 pub use store_helpers::*;
diff --git a/...store-redis/tests/common/redis_helpers.rs → ...edger-store/tests/common/redis_helpers.rs b/...store-redis/tests/common/redis_helpers.rs → ...edger-store/tests/common/redis_helpers.rs
diff --git a/...store-redis/tests/common/store_helpers.rs → ...edger-store/tests/common/store_helpers.rs b/...store-redis/tests/common/store_helpers.rs → ...edger-store/tests/common/store_helpers.rs
@@ -5,7 +5,10 @@ use futures::Future;
 use interledger_api::NodeStore;
 use interledger_packet::Address;
 use interledger_service::{Account as AccountTrait, AddressStore};
-use interledger_store_redis::{Account, RedisStore, RedisStoreBuilder};
+use interledger_store::{
+    account::Account,
+    redis::{RedisStore, RedisStoreBuilder},
+};
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use std::str::FromStr;

diff --git a/...nterledger-store-redis/tests/http_test.rs → crates/interledger-store/tests/http_test.rs b/...nterledger-store-redis/tests/http_test.rs → crates/interledger-store/tests/http_test.rs
diff --git a/...r-store-redis/tests/rate_limiting_test.rs → ...rledger-store/tests/rate_limiting_test.rs b/...r-store-redis/tests/rate_limiting_test.rs → ...rledger-store/tests/rate_limiting_test.rs
@@ -3,7 +3,7 @@ use common::*;
 use futures::future::join_all;
 use interledger_service::AddressStore;
 use interledger_service_util::{RateLimitError, RateLimitStore};
-use interledger_store_redis::AccountId;
+use interledger_store::account::{Account, AccountId};
 
 #[test]
 fn rate_limits_number_of_packets() {

diff --git a/...terledger-store-redis/tests/rates_test.rs → crates/interledger-store/tests/rates_test.rs b/...terledger-store-redis/tests/rates_test.rs → crates/interledger-store/tests/rates_test.rs
diff --git a/...rledger-store-redis/tests/routing_test.rs → ...s/interledger-store/tests/routing_test.rs b/...rledger-store-redis/tests/routing_test.rs → ...s/interledger-store/tests/routing_test.rs
@@ -6,7 +6,7 @@ use interledger_ccp::RouteManagerStore;
 use interledger_packet::Address;
 use interledger_router::RouterStore;
 use interledger_service::{Account as AccountTrait, AddressStore, Username};
-use interledger_store_redis::AccountId;
+use interledger_store::account::{Account, AccountId};
 use std::str::FromStr;
 use std::{collections::HashMap, time::Duration};
 use tokio_timer::sleep;

diff --git a/...dger-store-redis/tests/settlement_test.rs → ...nterledger-store/tests/settlement_test.rs b/...dger-store-redis/tests/settlement_test.rs → ...nterledger-store/tests/settlement_test.rs
@@ -11,7 +11,7 @@ use interledger_settlement::core::{
     idempotency::{IdempotentData, IdempotentStore},
     types::{LeftoversStore, SettlementAccount, SettlementStore},
 };
-use interledger_store_redis::AccountId;
+use interledger_store::account::AccountId;
 use lazy_static::lazy_static;
 use num_bigint::BigUint;
 use redis::{aio::SharedConnection, cmd};

diff --git a/crates/interledger/Cargo.toml b/crates/interledger/Cargo.toml
@@ -19,7 +19,7 @@ node = [
     "service-util",
     "settlement",
     "spsp",
-    "store-redis",
+    "store",
     "stream",
     "trace",
 ]
@@ -32,7 +32,7 @@ router = ["interledger-router"]
 service-util = ["interledger-service-util"]
 settlement = ["interledger-settlement" ]
 spsp = ["interledger-spsp", "stream"]
-store-redis = ["interledger-store-redis"]
+store = ["interledger-store"]
 stream = ["interledger-stream", "ildcp"]
 trace = ["interledger-service/trace"]
 
@@ -49,7 +49,7 @@ interledger-service-util = { path = "../interledger-service-util", version = "^0
 interledger-settlement = { path = "../interledger-settlement", version = "^0.3.0", optional = true, default-features = false }
 interledger-spsp = { path = "../interledger-spsp", version = "^0.4.0", optional = true, default-features = false }
 interledger-stream = { path = "../interledger-stream", version = "^0.4.0", optional = true, default-features = false }
-interledger-store-redis = { path = "../interledger-store-redis", version = "^0.4.0", optional = true, default-features = false }
+interledger-store = { path = "../interledger-store", version = "^0.4.0", optional = true, default-features = false }
 
 [badges]
 circle-ci = { repository = "interledger-rs/interledger-rs" }

diff --git a/crates/interledger/src/lib.rs b/crates/interledger/src/lib.rs
@@ -115,9 +115,9 @@ pub mod spsp {
 }
 
 /// Store implementation backed by Redis
-#[cfg(feature = "store-redis")]
-pub mod store_redis {
-    pub use interledger_store_redis::*;
+#[cfg(feature = "store")]
+pub mod store {
+    pub use interledger_store::*;
 }
 
 /// STREAM Protocol sender and receiver

diff --git a/docker/redis.conf b/docker/redis.conf
@@ -15,6 +15,6 @@ appendonly yes
 appendfsync everysec
 
 # Load redis-cell module, which is used for rate limiting
-loadmodule ./interledger-store-redis/external/libredis_cell.so
+loadmodule ./interledger-store/external/libredis_cell.so
 
 daemonize yes