Skip to content

Commit 7f1f7df

Browse files
areshandareshand
committed
update tests
1 parent 57602f0 commit 7f1f7df

File tree

31 files changed

+90
-333
lines changed

31 files changed

+90
-333
lines changed

‎aptos-move/aptos-release-builder/src/components/feature_flags.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,9 @@ impl From<FeatureFlag> for AptosFeatureFlag {
285285
FeatureFlag::ReconfigureWithDkg => AptosFeatureFlag::_DEPRECATED_RECONFIGURE_WITH_DKG,
286286
FeatureFlag::KeylessAccounts => AptosFeatureFlag::KEYLESS_ACCOUNTS,
287287
FeatureFlag::KeylessButZklessAccounts => AptosFeatureFlag::KEYLESS_BUT_ZKLESS_ACCOUNTS,
288-
FeatureFlag::RemoveDetailedError => AptosFeatureFlag::REMOVE_DETAILED_ERROR_FROM_HASH,
288+
FeatureFlag::RemoveDetailedError => {
289+
AptosFeatureFlag::_DEPRECATED_REMOVE_DETAILED_ERROR_FROM_HASH
290+
},
289291
FeatureFlag::JwkConsensus => AptosFeatureFlag::JWK_CONSENSUS,
290292
FeatureFlag::ConcurrentFungibleAssets => AptosFeatureFlag::CONCURRENT_FUNGIBLE_ASSETS,
291293
FeatureFlag::RefundableBytes => AptosFeatureFlag::REFUNDABLE_BYTES,
@@ -430,7 +432,9 @@ impl From<AptosFeatureFlag> for FeatureFlag {
430432
AptosFeatureFlag::_DEPRECATED_RECONFIGURE_WITH_DKG => FeatureFlag::ReconfigureWithDkg,
431433
AptosFeatureFlag::KEYLESS_ACCOUNTS => FeatureFlag::KeylessAccounts,
432434
AptosFeatureFlag::KEYLESS_BUT_ZKLESS_ACCOUNTS => FeatureFlag::KeylessButZklessAccounts,
433-
AptosFeatureFlag::REMOVE_DETAILED_ERROR_FROM_HASH => FeatureFlag::RemoveDetailedError,
435+
AptosFeatureFlag::_DEPRECATED_REMOVE_DETAILED_ERROR_FROM_HASH => {
436+
FeatureFlag::RemoveDetailedError
437+
},
434438
AptosFeatureFlag::JWK_CONSENSUS => FeatureFlag::JwkConsensus,
435439
AptosFeatureFlag::CONCURRENT_FUNGIBLE_ASSETS => FeatureFlag::ConcurrentFungibleAssets,
436440
AptosFeatureFlag::REFUNDABLE_BYTES => FeatureFlag::RefundableBytes,

‎aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/borrow_in_loop.exp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ task 1 'publish'. lines 4-26:
44
Error: VMError with status STLOC_UNSAFE_TO_DESTROY_ERROR at location Module ModuleId { address: f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6, name: Identifier("m") } at index 0 for function definition at code offset 11 in function definition 0
55

66
task 2 'run'. lines 28-28:
7-
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
7+
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(LINKER_ERROR))
88

99
task 3 'run'. lines 30-44:
10-
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
10+
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(STLOC_UNSAFE_TO_DESTROY_ERROR))

‎aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/borrow_in_loop.v2_exp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ task 1 'publish'. lines 4-26:
44
Error: VMError with status STLOC_UNSAFE_TO_DESTROY_ERROR at location Module ModuleId { address: f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6, name: Identifier("m") } at index 0 for function definition at code offset 11 in function definition 0
55

66
task 2 'run'. lines 28-28:
7-
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
7+
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(LINKER_ERROR))
88

99
task 3 'run'. lines 30-44:
10-
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
10+
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(STLOC_UNSAFE_TO_DESTROY_ERROR))

‎aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ bug: BYTECODE VERIFICATION FAILED
7373

7474

7575
task 3 'run'. lines 70-70:
76-
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(None)
76+
Error: Failed to execute transaction. ExecutionStatus: MiscellaneousError(Some(LINKER_ERROR))

‎aptos-move/aptos-vm-types/src/output.rs

+1-10
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ pub struct VMOutput {
3434
module_write_set: ModuleWriteSet,
3535
fee_statement: FeeStatement,
3636
status: TransactionStatus,
37-
auxiliary_data: TransactionAuxiliaryData,
3837
}
3938

4039
impl VMOutput {
@@ -43,14 +42,12 @@ impl VMOutput {
4342
module_write_set: ModuleWriteSet,
4443
fee_statement: FeeStatement,
4544
status: TransactionStatus,
46-
auxiliary_data: TransactionAuxiliaryData,
4745
) -> Self {
4846
Self {
4947
change_set,
5048
module_write_set,
5149
fee_statement,
5250
status,
53-
auxiliary_data,
5451
}
5552
}
5653

@@ -60,7 +57,6 @@ impl VMOutput {
6057
module_write_set: ModuleWriteSet::empty(),
6158
fee_statement: FeeStatement::zero(),
6259
status,
63-
auxiliary_data: TransactionAuxiliaryData::default(),
6460
}
6561
}
6662

@@ -102,10 +98,6 @@ impl VMOutput {
10298
&self.status
10399
}
104100

105-
pub fn auxiliary_data(&self) -> &TransactionAuxiliaryData {
106-
&self.auxiliary_data
107-
}
108-
109101
pub fn materialized_size(&self) -> u64 {
110102
let mut size = 0;
111103
for (state_key, write_size) in self
@@ -179,7 +171,6 @@ impl VMOutput {
179171
module_write_set,
180172
fee_statement,
181173
status,
182-
auxiliary_data,
183174
} = self;
184175
let (write_set, events) = change_set
185176
.try_combine_into_storage_change_set(module_write_set)?
@@ -189,7 +180,7 @@ impl VMOutput {
189180
events,
190181
fee_statement.gas_used(),
191182
status,
192-
auxiliary_data,
183+
TransactionAuxiliaryData::default(),
193184
))
194185
}
195186

‎aptos-move/aptos-vm-types/src/tests/utils.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use aptos_types::{
1616
fee_statement::FeeStatement,
1717
on_chain_config::CurrentTimeMicroseconds,
1818
state_store::{state_key::StateKey, state_value::StateValueMetadata},
19-
transaction::{ExecutionStatus, TransactionAuxiliaryData, TransactionStatus},
19+
transaction::{ExecutionStatus, TransactionStatus},
2020
write_set::WriteOp,
2121
};
2222
use move_binary_format::errors::PartialVMResult;
@@ -252,7 +252,6 @@ pub(crate) fn build_vm_output(
252252
ModuleWriteSet::new(false, module_write_set.into_iter().collect()),
253253
FeeStatement::new(GAS_USED, GAS_USED, 0, 0, 0),
254254
STATUS,
255-
TransactionAuxiliaryData::default(),
256255
)
257256
}
258257

‎aptos-move/aptos-vm/src/aptos_vm.rs

+4-15
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ use aptos_types::{
7070
authenticator::AnySignature, signature_verified_transaction::SignatureVerifiedTransaction,
7171
BlockOutput, EntryFunction, ExecutionError, ExecutionStatus, ModuleBundle, Multisig,
7272
MultisigTransactionPayload, Script, SignedTransaction, Transaction, TransactionArgument,
73-
TransactionAuxiliaryData, TransactionOutput, TransactionPayload, TransactionStatus,
74-
VMValidatorResult, ViewFunctionOutput, WriteSetPayload,
73+
TransactionOutput, TransactionPayload, TransactionStatus, VMValidatorResult,
74+
ViewFunctionOutput, WriteSetPayload,
7575
},
7676
vm_status::{AbortLocation, StatusCode, VMStatus},
7777
};
@@ -186,7 +186,6 @@ pub(crate) fn get_system_transaction_output(
186186
ModuleWriteSet::empty(),
187187
FeeStatement::zero(),
188188
TransactionStatus::Keep(ExecutionStatus::Success),
189-
TransactionAuxiliaryData::default(),
190189
))
191190
}
192191

@@ -471,7 +470,7 @@ impl AptosVM {
471470
}
472471
}
473472

474-
let (txn_status, txn_aux_data) = TransactionStatus::from_vm_status(
473+
let txn_status = TransactionStatus::from_vm_status(
475474
error_vm_status.clone(),
476475
self.features()
477476
.is_enabled(FeatureFlag::CHARGE_INVARIANT_VIOLATION),
@@ -493,7 +492,6 @@ impl AptosVM {
493492
resolver,
494493
module_storage,
495494
status,
496-
txn_aux_data,
497495
log_context,
498496
change_set_configs,
499497
traversal_context,
@@ -541,7 +539,6 @@ impl AptosVM {
541539
resolver: &impl AptosMoveResolver,
542540
module_storage: &impl AptosModuleStorage,
543541
status: ExecutionStatus,
544-
txn_aux_data: TransactionAuxiliaryData,
545542
log_context: &AdapterLogSchema,
546543
change_set_configs: &ChangeSetConfigs,
547544
traversal_context: &mut TraversalContext,
@@ -672,13 +669,7 @@ impl AptosVM {
672669
)
673670
})?;
674671

675-
epilogue_session.finish(
676-
fee_statement,
677-
status,
678-
txn_aux_data,
679-
change_set_configs,
680-
module_storage,
681-
)
672+
epilogue_session.finish(fee_statement, status, change_set_configs, module_storage)
682673
}
683674

684675
fn success_transaction_cleanup(
@@ -728,7 +719,6 @@ impl AptosVM {
728719
let output = epilogue_session.finish(
729720
fee_statement,
730721
ExecutionStatus::Success,
731-
TransactionAuxiliaryData::default(),
732722
change_set_configs,
733723
module_storage,
734724
)?;
@@ -2307,7 +2297,6 @@ impl AptosVM {
23072297
module_write_set,
23082298
FeeStatement::zero(),
23092299
TransactionStatus::Keep(ExecutionStatus::Success),
2310-
TransactionAuxiliaryData::default(),
23112300
);
23122301
Ok((VMStatus::Executed, output))
23132302
}

‎aptos-move/aptos-vm/src/move_vm_ext/session/user_transaction_sessions/epilogue.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::{
1717
use aptos_gas_algebra::Fee;
1818
use aptos_types::{
1919
fee_statement::FeeStatement,
20-
transaction::{ExecutionStatus, TransactionAuxiliaryData, TransactionStatus},
20+
transaction::{ExecutionStatus, TransactionStatus},
2121
};
2222
use aptos_vm_types::{
2323
change_set::VMChangeSet, module_and_script_storage::module_storage::AptosModuleStorage,
@@ -104,7 +104,6 @@ impl<'r, 'l> EpilogueSession<'r, 'l> {
104104
self,
105105
fee_statement: FeeStatement,
106106
execution_status: ExecutionStatus,
107-
txn_aux_data: TransactionAuxiliaryData,
108107
change_set_configs: &ChangeSetConfigs,
109108
module_storage: &impl AptosModuleStorage,
110109
) -> Result<VMOutput, VMStatus> {
@@ -135,7 +134,6 @@ impl<'r, 'l> EpilogueSession<'r, 'l> {
135134
module_write_set,
136135
fee_statement,
137136
TransactionStatus::Keep(execution_status),
138-
txn_aux_data,
139137
))
140138
}
141139
}

‎aptos-move/e2e-move-tests/src/harness.rs

+4-10
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,11 @@ impl MoveHarness {
196196

197197
/// Runs a signed transaction. On success, applies the write set.
198198
pub fn run_raw(&mut self, txn: SignedTransaction) -> TransactionOutput {
199-
let mut output = self.executor.execute_transaction(txn);
199+
let output = self.executor.execute_transaction(txn);
200200
if matches!(output.status(), TransactionStatus::Keep(_)) {
201201
self.executor.apply_write_set(output.write_set());
202202
self.executor.append_events(output.events().to_vec());
203203
}
204-
output.fill_error_status();
205204
output
206205
}
207206

@@ -239,12 +238,11 @@ impl MoveHarness {
239238
&mut self,
240239
txn_block: Vec<SignedTransaction>,
241240
) -> Vec<TransactionOutput> {
242-
let mut result = assert_ok!(self.executor.execute_block(txn_block));
243-
for output in &mut result {
241+
let result = assert_ok!(self.executor.execute_block(txn_block));
242+
for output in &result {
244243
if matches!(output.status(), TransactionStatus::Keep(_)) {
245244
self.executor.apply_write_set(output.write_set());
246245
}
247-
output.fill_error_status();
248246
}
249247
result
250248
}
@@ -979,11 +977,7 @@ impl MoveHarness {
979977
offset,
980978
txns.len()
981979
);
982-
let mut outputs = harness.run_block_get_output(txns);
983-
let _ = outputs
984-
.iter_mut()
985-
.map(|t| t.fill_error_status())
986-
.collect::<Vec<_>>();
980+
let outputs = harness.run_block_get_output(txns);
987981
for (idx, (error, output)) in errors.into_iter().zip(outputs.iter()).enumerate() {
988982
if error == SUCCESS {
989983
assert_success!(

‎aptos-move/e2e-move-tests/src/tests/code_publishing.rs

+4-11
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,10 @@ fn code_publishing_upgrade_loader_cache_consistency() {
242242
|_| {},
243243
),
244244
];
245-
let result = h.run_block_get_output(txns);
246-
assert_success!(result[0].status().to_owned());
247-
assert_success!(result[1].status().to_owned());
248-
assert_eq!(
249-
result[2]
250-
.auxiliary_data()
251-
.get_detail_error_message()
252-
.unwrap()
253-
.status_code(),
254-
StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE
255-
)
245+
let result = h.run_block(txns);
246+
assert_success!(result[0]);
247+
assert_success!(result[1]);
248+
assert_vm_status!(result[2], StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE)
256249
}
257250

258251
#[test]

‎aptos-move/e2e-move-tests/src/tests/vm.rs

+1-10
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,6 @@ fn failed_transaction_cleanup_charges_gas(status_code: StatusCode) {
4141
balance,
4242
)
4343
.1;
44-
45-
assert_eq!(
46-
output
47-
.auxiliary_data()
48-
.get_detail_error_message()
49-
.unwrap()
50-
.status_code(),
51-
status_code
52-
);
5344
let write_set: Vec<(&StateKey, &WriteOp)> = output
5445
.concrete_write_set_iter()
5546
.map(|(k, v)| (k, assert_some!(v)))
@@ -59,6 +50,6 @@ fn failed_transaction_cleanup_charges_gas(status_code: StatusCode) {
5950
assert!(!output.status().is_discarded());
6051
assert_ok_eq!(
6152
output.status().as_kept_status(),
62-
ExecutionStatus::MiscellaneousError(None)
53+
ExecutionStatus::MiscellaneousError(Some(status_code))
6354
);
6455
}

‎aptos-move/e2e-tests/goldens/language_e2e_testsuite__tests__data_store__borrow_after_move.exp

+2-24
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,7 @@ Ok(
2121
code_offset: 2,
2222
},
2323
),
24-
auxiliary_data: V1(
25-
TransactionAuxiliaryDataV1 {
26-
detail_error_message: Some(
27-
VMErrorDetail {
28-
status_code: MISSING_DATA,
29-
message: Some(
30-
"Failed to move resource from f5b9d6f01a99e74c790e2f330c092fa05455a8193f1dfc1b113ecc54d067afe1",
31-
),
32-
},
33-
),
34-
},
35-
),
24+
auxiliary_data: None,
3625
},
3726
],
3827
)
@@ -126,18 +115,7 @@ Ok(
126115
code_offset: 2,
127116
},
128117
),
129-
auxiliary_data: V1(
130-
TransactionAuxiliaryDataV1 {
131-
detail_error_message: Some(
132-
VMErrorDetail {
133-
status_code: MISSING_DATA,
134-
message: Some(
135-
"Failed to borrow global resource from f5b9d6f01a99e74c790e2f330c092fa05455a8193f1dfc1b113ecc54d067afe1",
136-
),
137-
},
138-
),
139-
},
140-
),
118+
auxiliary_data: None,
141119
},
142120
],
143121
)

0 commit comments

Comments
 (0)