Skip to content

Commit e5c4702

Browse files
azarovhazarovh
committed
Rename cancel order to conclude
1 parent 8fe0684 commit e5c4702

40 files changed

+127
-127
lines changed

‎api-server/scanner-lib/src/blockchain_state/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ async fn calculate_fees<T: ApiServerStorageWrite>(
617617
| AccountCommand::UnfreezeToken(token_id)
618618
| AccountCommand::LockTokenSupply(token_id)
619619
| AccountCommand::ChangeTokenAuthority(token_id, _) => Some(*token_id),
620-
AccountCommand::CancelOrder(_) | AccountCommand::FillOrder(_, _, _) => None,
620+
AccountCommand::ConcludeOrder(_) | AccountCommand::FillOrder(_, _, _) => None,
621621
},
622622
})
623623
.collect();
@@ -1106,7 +1106,7 @@ async fn update_tables_from_transaction_inputs<T: ApiServerStorageWrite>(
11061106
)
11071107
.await;
11081108
}
1109-
AccountCommand::CancelOrder(_) | AccountCommand::FillOrder(_, _, _) => {
1109+
AccountCommand::ConcludeOrder(_) | AccountCommand::FillOrder(_, _, _) => {
11101110
// TODO(orders)
11111111
}
11121112
},

‎api-server/scanner-lib/src/sync/tests/simulation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ async fn simulation(
453453
chain_config.token_change_authority_fee(block_height);
454454
burn_coins(&mut statistics, token_change_authority_fee);
455455
}
456-
AccountCommand::CancelOrder(_) | AccountCommand::FillOrder(_, _, _) => {
456+
AccountCommand::ConcludeOrder(_) | AccountCommand::FillOrder(_, _, _) => {
457457
unimplemented!() // TODO(orders)
458458
}
459459
},

‎api-server/web-server/src/api/json_helpers.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ pub fn txoutput_to_json(
200200
TxOutput::AnyoneCanTake(data) => {
201201
json!({
202202
"type": "AnyoneCanTake",
203-
"cancel_key": Address::new(chain_config, data.cancel_key().clone()).expect("no error").as_str(),
203+
"conclude_key": Address::new(chain_config, data.conclude_key().clone()).expect("no error").as_str(),
204204
"ask_value": outputvalue_to_json(data.ask(), chain_config, token_decimals),
205205
"give_value": outputvalue_to_json(data.give(), chain_config, token_decimals),
206206
})
@@ -345,10 +345,10 @@ pub fn tx_input_to_json(
345345
"nonce": nonce,
346346
})
347347
}
348-
AccountCommand::CancelOrder(order_id) => {
348+
AccountCommand::ConcludeOrder(order_id) => {
349349
json!({
350350
"input_type": "AccountCommand",
351-
"command": "CancelOrder",
351+
"command": "ConcludeOrder",
352352
"order_id": Address::new(chain_config, *order_id).expect("addressable").to_string(),
353353
})
354354
}

‎chainstate/constraints-value-accumulator/src/constraints_accumulator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl ConstrainedValueAccumulator {
266266
CoinOrTokenId::Coin,
267267
chain_config.token_change_authority_fee(block_height),
268268
)),
269-
AccountCommand::CancelOrder(id) => {
269+
AccountCommand::ConcludeOrder(id) => {
270270
let order_data = orders_accounting_view
271271
.get_order_data(id)
272272
.map_err(|_| orders_accounting::Error::ViewFail)?

‎chainstate/constraints-value-accumulator/src/tests/orders_constraints.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ fn fill_order_constraints(#[case] seed: Seed) {
567567
#[rstest]
568568
#[trace]
569569
#[case(Seed::from_entropy())]
570-
fn cancel_order_constraints(#[case] seed: Seed) {
570+
fn conclude_order_constraints(#[case] seed: Seed) {
571571
let mut rng = make_seedable_rng(seed);
572572

573573
let chain_config = create_unit_test_config();
@@ -597,7 +597,7 @@ fn cancel_order_constraints(#[case] seed: Seed) {
597597
{
598598
let inputs = vec![TxInput::AccountCommand(
599599
AccountNonce::new(0),
600-
AccountCommand::CancelOrder(order_id),
600+
AccountCommand::ConcludeOrder(order_id),
601601
)];
602602
let input_utxos = vec![None];
603603

@@ -632,7 +632,7 @@ fn cancel_order_constraints(#[case] seed: Seed) {
632632
{
633633
let inputs = vec![TxInput::AccountCommand(
634634
AccountNonce::new(0),
635-
AccountCommand::CancelOrder(order_id),
635+
AccountCommand::ConcludeOrder(order_id),
636636
)];
637637
let input_utxos = vec![None];
638638

@@ -669,7 +669,7 @@ fn cancel_order_constraints(#[case] seed: Seed) {
669669
// partially use input in command
670670
let inputs = vec![TxInput::AccountCommand(
671671
AccountNonce::new(0),
672-
AccountCommand::CancelOrder(order_id),
672+
AccountCommand::ConcludeOrder(order_id),
673673
)];
674674
let input_utxos = vec![None];
675675

@@ -704,7 +704,7 @@ fn cancel_order_constraints(#[case] seed: Seed) {
704704
// valid case
705705
let inputs = vec![TxInput::AccountCommand(
706706
AccountNonce::new(0),
707-
AccountCommand::CancelOrder(order_id),
707+
AccountCommand::ConcludeOrder(order_id),
708708
)];
709709
let input_utxos = vec![None];
710710

‎chainstate/src/detail/ban_score.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -672,16 +672,16 @@ impl BanScore for orders_accounting::Error {
672672
Error::InvariantOrderAskBalanceChangedForUndo(_) => 100,
673673
Error::InvariantOrderGiveBalanceNotFoundForUndo(_) => 100,
674674
Error::InvariantOrderGiveBalanceChangedForUndo(_) => 100,
675-
Error::InvariantOrderDataExistForCancelUndo(_) => 100,
676-
Error::InvariantOrderAskBalanceExistForCancelUndo(_) => 100,
677-
Error::InvariantOrderGiveBalanceExistForCancelUndo(_) => 100,
675+
Error::InvariantOrderDataExistForConcludeUndo(_) => 100,
676+
Error::InvariantOrderAskBalanceExistForConcludeUndo(_) => 100,
677+
Error::InvariantOrderGiveBalanceExistForConcludeUndo(_) => 100,
678678
Error::FillOrderChangeLeft(_) => 100,
679679
Error::CurrencyMismatch => 100,
680680
Error::OrderOverflow(_) => 100,
681681
Error::OrderOverbid(_, _, _) => 100,
682-
Error::AttemptedCancelNonexistingOrderData(_) => 100,
683-
Error::AttemptedCancelNonexistingAskBalance(_) => 100,
684-
Error::AttemptedCancelNonexistingGiveBalance(_) => 100,
682+
Error::AttemptedConcludeNonexistingOrderData(_) => 100,
683+
Error::AttemptedConcludeNonexistingAskBalance(_) => 100,
684+
Error::AttemptedConcludeNonexistingGiveBalance(_) => 100,
685685
Error::InvariantNonzeroAskBalanceForMissingOrder(_) => 100,
686686
Error::InvariantNonzeroGiveBalanceForMissingOrder(_) => 100,
687687
Error::UnsupportedTokenVersion => 100,

‎chainstate/src/detail/error_classification.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -908,16 +908,16 @@ impl BlockProcessingErrorClassification for orders_accounting::Error {
908908
| Error::InvariantOrderAskBalanceChangedForUndo(_)
909909
| Error::InvariantOrderGiveBalanceNotFoundForUndo(_)
910910
| Error::InvariantOrderGiveBalanceChangedForUndo(_)
911-
| Error::InvariantOrderDataExistForCancelUndo(_)
912-
| Error::InvariantOrderAskBalanceExistForCancelUndo(_)
913-
| Error::InvariantOrderGiveBalanceExistForCancelUndo(_)
911+
| Error::InvariantOrderDataExistForConcludeUndo(_)
912+
| Error::InvariantOrderAskBalanceExistForConcludeUndo(_)
913+
| Error::InvariantOrderGiveBalanceExistForConcludeUndo(_)
914914
| Error::FillOrderChangeLeft(_)
915915
| Error::CurrencyMismatch
916916
| Error::OrderOverflow(_)
917917
| Error::OrderOverbid(_, _, _)
918-
| Error::AttemptedCancelNonexistingOrderData(_)
919-
| Error::AttemptedCancelNonexistingAskBalance(_)
920-
| Error::AttemptedCancelNonexistingGiveBalance(_)
918+
| Error::AttemptedConcludeNonexistingOrderData(_)
919+
| Error::AttemptedConcludeNonexistingAskBalance(_)
920+
| Error::AttemptedConcludeNonexistingGiveBalance(_)
921921
| Error::UnsupportedTokenVersion
922922
| Error::InvariantNonzeroAskBalanceForMissingOrder(_)
923923
| Error::InvariantNonzeroGiveBalanceForMissingOrder(_) => {

‎chainstate/src/rpc/types/account.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub enum RpcAccountCommand {
7474
token_id: RpcAddress<TokenId>,
7575
new_authority: RpcAddress<Destination>,
7676
},
77-
CancelOrder {
77+
ConcludeOrder {
7878
order_id: RpcAddress<OrderId>,
7979
},
8080
FillOrder {
@@ -113,7 +113,7 @@ impl RpcAccountCommand {
113113
new_authority: RpcAddress::new(chain_config, destination.clone())?,
114114
}
115115
}
116-
AccountCommand::CancelOrder(id) => RpcAccountCommand::CancelOrder {
116+
AccountCommand::ConcludeOrder(id) => RpcAccountCommand::ConcludeOrder {
117117
order_id: RpcAddress::new(chain_config, *id)?,
118118
},
119119
AccountCommand::FillOrder(id, fill, dest) => RpcAccountCommand::FillOrder {

‎chainstate/src/rpc/types/output.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ impl RpcTxOutput {
209209
data: RpcHexString::from_bytes(data),
210210
},
211211
TxOutput::AnyoneCanTake(data) => RpcTxOutput::AnyoneCanTake {
212-
authority: RpcAddress::new(chain_config, data.cancel_key().clone())?,
212+
authority: RpcAddress::new(chain_config, data.conclude_key().clone())?,
213213
ask_value: RpcOutputValue::new(chain_config, data.ask().clone())?,
214214
give_value: RpcOutputValue::new(chain_config, data.give().clone())?,
215215
},

‎chainstate/test-framework/src/random_tx_maker.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,15 +516,15 @@ impl<'a> RandomTxMaker<'a> {
516516
}
517517
AccountType::Order(order_id) => {
518518
if !self.account_command_used {
519-
// cancel an order
519+
// conclude an order
520520
let order_data = orders_cache.get_order_data(&order_id).unwrap().unwrap();
521521
if token_not_frozen(order_data.ask(), tokens_cache)
522522
&& token_not_frozen(order_data.give(), tokens_cache)
523523
{
524524
let new_nonce = self.get_next_nonce(AccountType::Order(order_id));
525525
result_inputs.push(TxInput::AccountCommand(
526526
new_nonce,
527-
AccountCommand::CancelOrder(order_id),
527+
AccountCommand::ConcludeOrder(order_id),
528528
));
529529

530530
let available_give_balance =
@@ -540,7 +540,7 @@ impl<'a> RandomTxMaker<'a> {
540540
let filled_output =
541541
output_value_with_amount(order_data.ask(), filled_amount);
542542

543-
let _ = orders_cache.cancel_order(order_id).unwrap();
543+
let _ = orders_cache.conclude_order(order_id).unwrap();
544544
self.account_command_used = true;
545545

546546
result_outputs.extend(vec![

0 commit comments

Comments
 (0)