Skip to content

Commit

Permalink
fix rebase master compiler error
Browse files Browse the repository at this point in the history
  • Loading branch information
nkysg committed Aug 22, 2023
1 parent 1cee9a8 commit 98d1230
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions vm/vm-runtime/src/adapter_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use starcoin_vm_types::{
},
write_set::WriteSet,
};
use std::collections::BTreeMap;

/// This trait describes the VM adapter's interface.
pub trait VMAdapter {
Expand Down Expand Up @@ -73,6 +74,7 @@ pub(crate) fn discard_error_vm_status(err: VMStatus) -> (VMStatus, TransactionOu
pub(crate) fn discard_error_output(err: StatusCode) -> TransactionOutput {
// Since this transaction will be discarded, no writeset will be included.
TransactionOutput::new(
BTreeMap::new(),
WriteSet::default(),
vec![],
0,
Expand Down
2 changes: 2 additions & 0 deletions vm/vm-runtime/src/parallel_executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use starcoin_vm_types::{
transaction::{Transaction, TransactionOutput, TransactionStatus},
write_set::{WriteOp, WriteSet},
};
use std::collections::BTreeMap;

impl PTransaction for PreprocessedTransaction {
type Key = StateKey;
Expand Down Expand Up @@ -51,6 +52,7 @@ impl PTransactionOutput for StarcoinTransactionOutput {
/// Execution output for transactions that comes after SkipRest signal.
fn skip_output() -> Self {
Self(TransactionOutput::new(
BTreeMap::new(),
WriteSet::default(),
vec![],
0,
Expand Down
1 change: 0 additions & 1 deletion vm/vm-runtime/src/starcoin_vm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ use starcoin_vm_types::{
transaction_metadata::TransactionMetadata,
vm_status::{StatusCode, VMStatus},
};
use std::collections::BTreeMap;
use std::cmp::min;
use std::sync::Arc;

Expand Down

0 comments on commit 98d1230

Please sign in to comment.