Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
EdHastingsCasperAssociation committed Mar 6, 2024
1 parent e3e1c4a commit 37b25d3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 83 deletions.
26 changes: 0 additions & 26 deletions execution_engine_testing/tests/src/test/system_costs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,32 +427,6 @@ fn delegate_and_undelegate_have_expected_costs() {
#[ignore]
#[test]
fn upgraded_delegate_and_undelegate_have_expected_costs() {
// let new_wasmless_transfer_cost = DEFAULT_WASMLESS_TRANSFER_COST;
// let new_max_associated_keys = DEFAULT_MAX_ASSOCIATED_KEYS;
//
// let new_auction_costs = AuctionCosts {
// delegate: NEW_DELEGATE_COST,
// undelegate: NEW_UNDELEGATE_COST,
// redelegate: NEW_REDELEGATE_COST,
// ..Default::default()
// };
// let new_mint_costs = MintCosts::default();
// let new_standard_payment_costs = StandardPaymentCosts::default();
// let new_handle_payment_costs = HandlePaymentCosts::default();
//
// let new_system_config = SystemConfig::new(
// new_wasmless_transfer_cost,
// new_auction_costs,
// new_mint_costs,
// new_handle_payment_costs,
// new_standard_payment_costs,
// );

// let new_engine_config = EngineConfigBuilder::default()
// .with_max_associated_keys(new_max_associated_keys)
// .with_system_config(new_system_config)
// .build();

let mut builder = LmdbWasmTestBuilder::default();
let accounts = {
let validator_1 = GenesisAccount::account(
Expand Down
51 changes: 0 additions & 51 deletions execution_engine_testing/tests/src/test/wasmless_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,39 +305,6 @@ enum InvalidWasmlessTransfer {
OtherPurseToSelfPurse,
}

// fn foo(invalid_wasmless_transfer: InvalidWasmlessTransfer) {
// let mut builder = LmdbWasmTestBuilder::default();
//
// // let create_account_1_request = ExecuteRequestBuilder::standard(
// // *DEFAULT_ACCOUNT_ADDR,
// // CONTRACT_TRANSFER_PURSE_TO_ACCOUNT,
// // runtime_args! {
// // mint::ARG_TARGET => *ACCOUNT_1_ADDR,
// // mint::ARG_AMOUNT => *DEFAULT_PAYMENT,
// // mint::ARG_ID => id
// // },
// // )
// // .build();
// let config = NativeRuntimeConfig::default();
// let block_time = Instant::now();
// let protocol_version = ProtocolVersion::V2_0_0;
// //transaction_hash: TransactionHash,
// let address = *DEFAULT_ACCOUNT_ADDR;
// let authorization_keys = &[*DEFAULT_ACCOUNT_ADDR];
// let args = runtime_args! {
// mint::ARG_TARGET => *ACCOUNT_1_ADDR,
// mint::ARG_AMOUNT => *DEFAULT_PAYMENT,
// mint::ARG_ID => None
// };
// // cost: U512,
// let transfer_request = TransferRequest::new();
// match builder.data_access_layer().transfer(transfer_request) {
// TransferResult::RootNotFound => {}
// TransferResult::Success { .. } => {}
// TransferResult::Failure(_) => {}
// }
// }

fn invalid_transfer_wasmless(invalid_wasmless_transfer: InvalidWasmlessTransfer) {
let create_account_2: bool = true;
let mut builder = init_wasmless_transform_builder(create_account_2);
Expand Down Expand Up @@ -992,24 +959,6 @@ fn transfer_wasmless_should_observe_upgraded_cost() {

const DEFAULT_ACTIVATION_POINT: EraId = EraId::new(1);

// let new_auction_costs = AuctionCosts::default();
// let new_mint_costs = MintCosts::default();
// let new_handle_payment_costs = HandlePaymentCosts::default();
// let new_standard_payment_costs = StandardPaymentCosts::default();

// let new_system_config = SystemConfig::new(
// new_wasmless_transfer_cost_value,
// new_auction_costs,
// new_mint_costs,
// new_handle_payment_costs,
// new_standard_payment_costs,
// );

// let new_engine_config = EngineConfigBuilder::default()
// .with_max_associated_keys(new_max_associated_keys)
// .with_system_config(new_system_config)
// .build();

let old_protocol_version = *DEFAULT_PROTOCOL_VERSION;
let new_protocol_version = ProtocolVersion::from_parts(
old_protocol_version.value().major,
Expand Down
6 changes: 0 additions & 6 deletions storage/src/global_state/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ pub enum Error {
FailedToPrune(Vec<Key>),
}

// impl From<bytesrepr::Error> for Error {
// fn from(error: bytesrepr::Error) -> Self {
// Error::BytesRepr(error)
// }
// }

impl<T> From<sync::PoisonError<T>> for Error {
fn from(_error: sync::PoisonError<T>) -> Self {
Error::Poison
Expand Down

0 comments on commit 37b25d3

Please sign in to comment.