Skip to content

Commit a74609c

Browse files
gakonstgakonst
committed
fix(crate): Remove settlement_engine_asset_scale from account
1 parent 36a3732 commit a74609c

File tree

13 files changed

+4
-57
lines changed

13 files changed

+4
-57
lines changed

‎crates/interledger-api/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ pub struct AccountDetails {
7171
pub amount_per_minute_limit: Option<u64>,
7272
pub packets_per_minute_limit: Option<u32>,
7373
pub settlement_engine_url: Option<String>,
74-
pub settlement_engine_asset_scale: Option<u8>,
7574
}
7675

7776
pub struct NodeApi<S, I> {

‎crates/interledger-settlement-engines/tests/eth_ledger_settlement.rs

-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ fn eth_ledger_settlement() {
9393
packets_per_minute_limit: None,
9494
amount_per_minute_limit: None,
9595
settlement_engine_url: None,
96-
settlement_engine_asset_scale: None,
9796
})
9897
.and_then(move |_| {
9998
node1_clone.insert_account(AccountDetails {
@@ -119,7 +118,6 @@ fn eth_ledger_settlement() {
119118
"http://localhost:{}",
120119
node1_engine
121120
)),
122-
settlement_engine_asset_scale: Some(ETH_DECIMALS),
123121
})
124122
})
125123
.and_then(move |_| node1.serve())
@@ -163,7 +161,6 @@ fn eth_ledger_settlement() {
163161
packets_per_minute_limit: None,
164162
amount_per_minute_limit: None,
165163
settlement_engine_url: None,
166-
settlement_engine_asset_scale: None,
167164
})
168165
.and_then(move |_| {
169166
node2
@@ -190,7 +187,6 @@ fn eth_ledger_settlement() {
190187
"http://localhost:{}",
191188
node2_engine
192189
)),
193-
settlement_engine_asset_scale: Some(ETH_DECIMALS),
194190
})
195191
.and_then(move |_| node2.serve())
196192
})

‎crates/interledger-settlement-engines/tests/eth_xrp_interoperable.rs

-6
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ fn eth_xrp_interoperable() {
129129
packets_per_minute_limit: None,
130130
amount_per_minute_limit: None,
131131
settlement_engine_url: None,
132-
settlement_engine_asset_scale: None,
133132
})
134133
.and_then(move |_|
135134
// TODO insert the accounts via HTTP request
@@ -154,7 +153,6 @@ fn eth_xrp_interoperable() {
154153
packets_per_minute_limit: None,
155154
amount_per_minute_limit: None,
156155
settlement_engine_url: Some(format!("http://localhost:{}", node1_engine)),
157-
settlement_engine_asset_scale: Some(18),
158156
}))
159157
.and_then(move |_| node1.serve())
160158
}),
@@ -196,7 +194,6 @@ fn eth_xrp_interoperable() {
196194
packets_per_minute_limit: None,
197195
amount_per_minute_limit: None,
198196
settlement_engine_url: Some(format!("http://localhost:{}", node2_engine)),
199-
settlement_engine_asset_scale: Some(ETH_DECIMALS),
200197
})
201198
.and_then(move |_| {
202199
node2_clone.insert_account(AccountDetails {
@@ -222,7 +219,6 @@ fn eth_xrp_interoperable() {
222219
"http://localhost:{}",
223220
node2_xrp_engine_port
224221
)),
225-
settlement_engine_asset_scale: Some(XRP_DECIMALS),
226222
})
227223
})
228224
})
@@ -282,7 +278,6 @@ fn eth_xrp_interoperable() {
282278
packets_per_minute_limit: None,
283279
amount_per_minute_limit: None,
284280
settlement_engine_url: None,
285-
settlement_engine_asset_scale: None,
286281
})
287282
.and_then(move |_| {
288283
node3_clone.insert_account(AccountDetails {
@@ -308,7 +303,6 @@ fn eth_xrp_interoperable() {
308303
"http://localhost:{}",
309304
node3_xrp_engine_port
310305
)),
311-
settlement_engine_asset_scale: Some(XRP_DECIMALS),
312306
})
313307
})
314308
})

‎crates/interledger-settlement-engines/tests/test_helpers.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ pub fn create_account(
100100
.map_err(|err| {
101101
eprintln!("Error creating account: {:?}", err);
102102
})
103-
.and_then(move |chunk| {
104-
println!("GOT RES {} {} {:?}", engine_port, account_id, chunk);
105-
Ok(str::from_utf8(&chunk).unwrap().to_string())
106-
})
103+
.and_then(move |chunk| Ok(str::from_utf8(&chunk).unwrap().to_string()))
107104
}
108105

109106
pub fn send_money(

‎crates/interledger-settlement-engines/tests/xrp_ledger_settlement.rs

-4
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ fn xrp_ledger_settlement() {
104104
packets_per_minute_limit: None,
105105
amount_per_minute_limit: None,
106106
settlement_engine_url: None,
107-
settlement_engine_asset_scale: None,
108107
})
109108
.and_then(move |_| {
110109
node1_clone.insert_account(AccountDetails {
@@ -127,7 +126,6 @@ fn xrp_ledger_settlement() {
127126
packets_per_minute_limit: None,
128127
amount_per_minute_limit: None,
129128
settlement_engine_url: Some(format!("http://localhost:{}", node1_engine)),
130-
settlement_engine_asset_scale: Some(XRP_DECIMALS),
131129
})
132130
})
133131
.and_then(move |_| node1.serve()),
@@ -167,7 +165,6 @@ fn xrp_ledger_settlement() {
167165
packets_per_minute_limit: None,
168166
amount_per_minute_limit: None,
169167
settlement_engine_url: None,
170-
settlement_engine_asset_scale: None,
171168
})
172169
.and_then(move |_| {
173170
node2
@@ -191,7 +188,6 @@ fn xrp_ledger_settlement() {
191188
packets_per_minute_limit: None,
192189
amount_per_minute_limit: None,
193190
settlement_engine_url: Some(format!("http://localhost:{}", node2_engine)),
194-
settlement_engine_asset_scale: Some(XRP_DECIMALS),
195191
})
196192
.and_then(move |_| node2.serve())
197193
}),

‎crates/interledger-settlement/src/api.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use super::{
22
Convert, ConvertDetails, IdempotentData, IdempotentStore, Quantity, SettlementAccount,
33
SettlementStore, SE_ILP_ADDRESS,
44
};
5+
use bigint::uint::U256 as BigU256;
56
use bytes::Bytes;
67
use futures::{
78
future::{err, ok, result, Either},
89
Future,
910
};
10-
use bigint::uint::U256 as BigU256;
1111
use hyper::{Response, StatusCode};
1212
use interledger_ildcp::IldcpAccount;
1313
use interledger_packet::PrepareBuilder;

‎crates/interledger-settlement/src/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ impl Quantity {
4848
pub struct SettlementEngineDetails {
4949
/// Base URL of the settlement engine
5050
pub url: Url,
51-
/// Asset scale that the settlement engine is configured to use.
52-
/// For example, sending a settlement for amount 1000 to a settlement engine
53-
/// that uses as scale of 3 would mean that it should send 1 whole unit of that asset.
54-
/// The SettlementClient translates the amounts used for each account internally within
55-
/// Interledger.rs into the correct scale used by the settlement engine.
56-
pub asset_scale: u8,
5751
}
5852

5953
pub trait SettlementAccount: Account {

‎crates/interledger-store-redis/src/account.rs

+2-18
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ pub struct Account {
5555
pub(crate) amount_per_minute_limit: Option<u64>,
5656
#[serde(serialize_with = "optional_url_to_string")]
5757
pub(crate) settlement_engine_url: Option<Url>,
58-
pub(crate) settlement_engine_asset_scale: Option<u8>,
5958
}
6059

6160
fn address_to_string<S>(address: &Address, serializer: S) -> Result<S::Ok, S::Error>
@@ -147,7 +146,6 @@ impl Account {
147146
packets_per_minute_limit: details.packets_per_minute_limit,
148147
amount_per_minute_limit: details.amount_per_minute_limit,
149148
settlement_engine_url,
150-
settlement_engine_asset_scale: details.settlement_engine_asset_scale,
151149
})
152150
}
153151

@@ -258,10 +256,6 @@ impl ToRedisArgs for AccountWithEncryptedTokens {
258256
"settlement_engine_url".write_redis_args(&mut rv);
259257
settlement_engine_url.as_str().write_redis_args(&mut rv);
260258
}
261-
if let Some(settlement_engine_asset_scale) = account.settlement_engine_asset_scale {
262-
"settlement_engine_asset_scale".write_redis_args(&mut rv);
263-
settlement_engine_asset_scale.write_redis_args(&mut rv);
264-
}
265259

266260
debug_assert!(rv.len() <= ACCOUNT_DETAILS_FIELDS * 2);
267261
debug_assert!((rv.len() % 2) == 0);
@@ -307,10 +301,6 @@ impl FromRedisValue for AccountWithEncryptedTokens {
307301
packets_per_minute_limit: get_value_option("packets_per_minute_limit", &hash)?,
308302
amount_per_minute_limit: get_value_option("amount_per_minute_limit", &hash)?,
309303
settlement_engine_url: get_url_option("settlement_engine_url", &hash)?,
310-
settlement_engine_asset_scale: get_value_option(
311-
"settlement_engine_asset_scale",
312-
&hash,
313-
)?,
314304
},
315305
})
316306
}
@@ -461,14 +451,8 @@ impl RateLimitAccount for Account {
461451

462452
impl SettlementAccount for Account {
463453
fn settlement_engine_details(&self) -> Option<SettlementEngineDetails> {
464-
match (
465-
&self.settlement_engine_url,
466-
self.settlement_engine_asset_scale,
467-
) {
468-
(Some(url), Some(asset_scale)) => Some(SettlementEngineDetails {
469-
url: url.clone(),
470-
asset_scale,
471-
}),
454+
match &self.settlement_engine_url {
455+
Some(url) => Some(SettlementEngineDetails { url: url.clone() }),
472456
_ => None,
473457
}
474458
}

‎crates/interledger-store-redis/tests/common/fixtures.rs

-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ lazy_static! {
2424
amount_per_minute_limit: Some(1000),
2525
packets_per_minute_limit: Some(2),
2626
settlement_engine_url: None,
27-
settlement_engine_asset_scale: None,
2827
};
2928
pub static ref ACCOUNT_DETAILS_1: AccountDetails = AccountDetails {
3029
ilp_address: Address::from_str("example.bob").unwrap(),
@@ -46,7 +45,6 @@ lazy_static! {
4645
amount_per_minute_limit: Some(1000),
4746
packets_per_minute_limit: Some(20),
4847
settlement_engine_url: None,
49-
settlement_engine_asset_scale: None,
5048
};
5149
pub static ref ACCOUNT_DETAILS_2: AccountDetails = AccountDetails {
5250
ilp_address: Address::from_str("example.charlie").unwrap(),
@@ -68,6 +66,5 @@ lazy_static! {
6866
amount_per_minute_limit: None,
6967
packets_per_minute_limit: None,
7068
settlement_engine_url: None,
71-
settlement_engine_asset_scale: None,
7269
};
7370
}

‎crates/interledger-store-redis/tests/routing_test.rs

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ fn polls_for_route_updates() {
5353
amount_per_minute_limit: None,
5454
packets_per_minute_limit: None,
5555
settlement_engine_url: None,
56-
settlement_engine_asset_scale: None,
5756
})
5857
})
5958
.and_then(move |_| {

‎crates/interledger/src/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ pub fn main() {
336336
amount_per_minute_limit: value_t!(matches, "amount_per_minute_limit", u64)
337337
.ok(),
338338
settlement_engine_url: None,
339-
settlement_engine_asset_scale: None,
340339
};
341340
tokio::run(insert_account_redis(redis_uri, &server_secret, account));
342341
}

‎crates/interledger/tests/btp_end_to_end.rs

-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ fn btp_end_to_end() {
5656
packets_per_minute_limit: None,
5757
amount_per_minute_limit: None,
5858
settlement_engine_url: None,
59-
settlement_engine_asset_scale: None,
6059
}),
6160
node.insert_account(AccountDetails {
6261
ilp_address: Address::from_str("example.node.two").unwrap(),
@@ -78,7 +77,6 @@ fn btp_end_to_end() {
7877
packets_per_minute_limit: None,
7978
amount_per_minute_limit: None,
8079
settlement_engine_url: None,
81-
settlement_engine_asset_scale: None,
8280
}),
8381
])
8482
});

‎crates/interledger/tests/three_nodes.rs

-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ fn three_nodes() {
7777
packets_per_minute_limit: None,
7878
amount_per_minute_limit: None,
7979
settlement_engine_url: None,
80-
settlement_engine_asset_scale: None,
8180
})
8281
.and_then(move |_|
8382
// TODO insert the accounts via HTTP request
@@ -102,7 +101,6 @@ fn three_nodes() {
102101
packets_per_minute_limit: None,
103102
amount_per_minute_limit: None,
104103
settlement_engine_url: None,
105-
settlement_engine_asset_scale: None,
106104
}))
107105
.and_then(move |_| node1.serve()),
108106
);
@@ -140,7 +138,6 @@ fn three_nodes() {
140138
packets_per_minute_limit: None,
141139
amount_per_minute_limit: None,
142140
settlement_engine_url: None,
143-
settlement_engine_asset_scale: None,
144141
}),
145142
node2.insert_account(AccountDetails {
146143
ilp_address: Address::from_str("example.two.three").unwrap(),
@@ -162,7 +159,6 @@ fn three_nodes() {
162159
packets_per_minute_limit: None,
163160
amount_per_minute_limit: None,
164161
settlement_engine_url: None,
165-
settlement_engine_asset_scale: None,
166162
}),
167163
])
168164
.and_then(move |_| node2.serve())
@@ -218,7 +214,6 @@ fn three_nodes() {
218214
packets_per_minute_limit: None,
219215
amount_per_minute_limit: None,
220216
settlement_engine_url: None,
221-
settlement_engine_asset_scale: None,
222217
}),
223218
node3_clone.insert_account(AccountDetails {
224219
ilp_address: Address::from_str("example.two").unwrap(),
@@ -240,7 +235,6 @@ fn three_nodes() {
240235
packets_per_minute_limit: None,
241236
amount_per_minute_limit: None,
242237
settlement_engine_url: None,
243-
settlement_engine_asset_scale: None,
244238
}),
245239
])
246240
.and_then(move |_| node3.serve())

0 commit comments

Comments
 (0)