Skip to content

Commit 24eac85

Browse files
committed
Adress feedback
1 parent 7f4d962 commit 24eac85

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

crates/sui-framework/docs/sui/funds_accumulator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Aborts with <code><a href="../sui/funds_accumulator.md#sui_funds_accumulator_EOv
227227

228228

229229

230-
<pre><code><b>public</b> <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">sui::funds_accumulator::Withdrawal</a>&lt;T&gt;): T
230+
<pre><code><b>public</b>(<a href="../sui/package.md#sui_package">package</a>) <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">sui::funds_accumulator::Withdrawal</a>&lt;T&gt;): T
231231
</code></pre>
232232

233233

@@ -236,7 +236,7 @@ Aborts with <code><a href="../sui/funds_accumulator.md#sui_funds_accumulator_EOv
236236
<summary>Implementation</summary>
237237

238238

239-
<pre><code><b>public</b> <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;/* internal */ T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">Withdrawal</a>&lt;T&gt;): T {
239+
<pre><code><b>public</b>(<a href="../sui/package.md#sui_package">package</a>) <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;/* internal */ T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">Withdrawal</a>&lt;T&gt;): T {
240240
<b>let</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">Withdrawal</a> { owner, limit: value } = withdrawal;
241241
<a href="../sui/funds_accumulator.md#sui_funds_accumulator_withdraw_impl">withdraw_impl</a>(owner, value)
242242
}

crates/sui-framework/packages/sui-framework/sources/funds_accumulator.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public fun withdrawal_join<T: store>(withdrawal: &mut Withdrawal<T>, other: With
7171
// TODO When this becomes `public` we need
7272
// - custom verifier rules for `T`
7373
// - private generic rules for `T`
74-
public fun redeem</* internal */ T: store>(withdrawal: Withdrawal<T>): T {
74+
public(package) fun redeem</* internal */ T: store>(withdrawal: Withdrawal<T>): T {
7575
let Withdrawal { owner, limit: value } = withdrawal;
7676
withdraw_impl(owner, value)
7777
}
0 Bytes
Binary file not shown.

crates/sui-framework/published_api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,7 @@ withdrawal_join
18171817
public fun
18181818
0x2::funds_accumulator
18191819
redeem
1820-
public fun
1820+
public(package) fun
18211821
0x2::funds_accumulator
18221822
withdraw_from_object
18231823
public(package) fun

crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -240,56 +240,56 @@ validators:
240240
next_epoch_worker_address: ~
241241
extra_fields:
242242
id:
243-
id: "0x60f0fa9e616607fd37cd5a838761683d09267467116806512808dfca3d6393f1"
243+
id: "0xdec8a0204ceff9639bb236eeabe612aa04fdb4921e20234cdc02074bb30e25ad"
244244
size: 0
245245
voting_power: 10000
246-
operation_cap_id: "0x8740beecc31986061a943b065aa964756fadf2b15e06d3ab0fecfd05bd16cbcf"
246+
operation_cap_id: "0x01929822f34608e650aa693b33f736b006ff9e2417265b442683342c6d7f5c83"
247247
gas_price: 1000
248248
staking_pool:
249-
id: "0x922ca1a3aee20b04bdb48146a8c4e0603c688c6ab6ad9f654f818e95142f5330"
249+
id: "0x9f697043f1cf40ab8f2c32bb048ddeda52f886f189500152be2d1432a603e94f"
250250
activation_epoch: 0
251251
deactivation_epoch: ~
252252
sui_balance: 20000000000000000
253253
rewards_pool:
254254
value: 0
255255
pool_token_balance: 20000000000000000
256256
exchange_rates:
257-
id: "0x070d22422efb725fe02df34ac4d9ad76b713ac15cc9ea7479292ea5ab9fcb7fa"
257+
id: "0x0bddc996985b192c504452d392241e17f43dd306d9cc91903caa9ad0c5b35dad"
258258
size: 1
259259
pending_stake: 0
260260
pending_total_sui_withdraw: 0
261261
pending_pool_token_withdraw: 0
262262
extra_fields:
263263
id:
264-
id: "0xadec63ef2e3a7448a29065e11edae5e122beb704a4e4efd679eebd5c36f41899"
264+
id: "0x16182104979315f3bae5310e669647f3aa02225b789a623a86826ae227f4efd0"
265265
size: 0
266266
commission_rate: 200
267267
next_epoch_stake: 20000000000000000
268268
next_epoch_gas_price: 1000
269269
next_epoch_commission_rate: 200
270270
extra_fields:
271271
id:
272-
id: "0xd11fa723631e40431fb6a11653f13d14cd32950da5080d93bef068d27cac8eff"
272+
id: "0x7c5f708f8613792f269191274032625055bc0b7af82b3a3b008d69b22ea3de54"
273273
size: 0
274274
pending_active_validators:
275275
contents:
276-
id: "0xee4f787eb9c6930114322ff13eedd21b6f0fff25116cda573cccc8ef2dc5c6ea"
276+
id: "0xa69278ddee34861c02aa719dfa109625b08c342fa7736d65d9e1be8ca8f4f586"
277277
size: 0
278278
pending_removals: []
279279
staking_pool_mappings:
280-
id: "0x4b099d22ad663735c145902bef3241a626c7cc9c418fed59bc9f274339186df9"
280+
id: "0x69db4f63522ec02b65694e9dd4f44057ee4d7c5aec2a2885e39c4402a745d48f"
281281
size: 1
282282
inactive_validators:
283-
id: "0x16999c05f5b289c339035bb5ddc4b1e09641359434a84a7774cf5c515557cf3a"
283+
id: "0x6ed75f4c21dc03e9ecd5f82e15c0d5f08a3fd4a5b466f93b4a395899f96c3a6b"
284284
size: 0
285285
validator_candidates:
286-
id: "0x80490d536c169c3382d2ca01a2b61859ffc597d806a41e71e57931bb792b8dfe"
286+
id: "0x5d71a1511ad04d8368b51343b6a213a1d2a0dadbc9d98cded98d341d50c4a373"
287287
size: 0
288288
at_risk_validators:
289289
contents: []
290290
extra_fields:
291291
id:
292-
id: "0xd8fa5918aa4891ed21850029e0146127dd116edc08f6c7ac06f5c61d23d2c517"
292+
id: "0x640464d289d3b7596d67a8b94ecba02e90c3b423c3928f600c636add22d0ff32"
293293
size: 0
294294
storage_fund:
295295
total_object_storage_rebates:
@@ -306,7 +306,7 @@ parameters:
306306
validator_low_stake_grace_period: 7
307307
extra_fields:
308308
id:
309-
id: "0xbf7284890e9f96a4f95507f20a7a2ce1d8367dcf5176d7aa14409ca767afb078"
309+
id: "0xdee6523f80c54fd433c62450c7077d79f214ec0340ad6c23f09b4578248e43a8"
310310
size: 0
311311
reference_gas_price: 1000
312312
validator_report_records:
@@ -320,7 +320,7 @@ stake_subsidy:
320320
stake_subsidy_decrease_rate: 1000
321321
extra_fields:
322322
id:
323-
id: "0x986ce94bad81a80fbaf5387d094054287089875a28f2ac1382c8d65615f55ab5"
323+
id: "0x5a1debbbd0897fdf8a57e1151cfc13ec56a9f342dfb429ce002e6a8ffbe1ab92"
324324
size: 0
325325
safe_mode: false
326326
safe_mode_storage_rewards:
@@ -332,5 +332,5 @@ safe_mode_non_refundable_storage_fee: 0
332332
epoch_start_timestamp_ms: 10
333333
extra_fields:
334334
id:
335-
id: "0xf9889dfca12569d0eb937e47ba7fb2c690d0c7895fe6d7a7816d0aeda69d91cf"
335+
id: "0xda7c7f9f18cc4e253329c931bdfc89320fcdef21e8eb6a8a39e21e18c1ffb1fc"
336336
size: 0

examples/move/object_balance/sources/object_balance.move

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public fun new(ctx: &mut TxContext) {
1717
}
1818

1919
public fun withdraw_funds<T>(vault: &mut Vault, amount: u64): Balance<T> {
20-
sui::balance::withdraw_funds_from_object(
20+
sui::balance::redeem_funds(sui::balance::withdraw_funds_from_object(
2121
&mut vault.id, amount
22-
).redeem()
22+
))
2323
}

0 commit comments

Comments
 (0)