Skip to content

Commit

Permalink
[fix] after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
akichidis committed Nov 11, 2024
1 parent 31bd18d commit 267ef47
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion crates/sui-core/src/mock_consensus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use std::sync::{Arc, Weak};
use sui_types::error::{SuiError, SuiResult};
use sui_types::executable_transaction::VerifiedExecutableTransaction;
use sui_types::messages_consensus::{ConsensusTransaction, ConsensusTransactionKind};
use sui_types::transaction::VerifiedCertificate;
use sui_types::transaction::{VerifiedCertificate, VerifiedTransaction};
use tokio::sync::{mpsc, oneshot};
use tokio::task::JoinHandle;
use tracing::debug;
Expand Down
11 changes: 7 additions & 4 deletions crates/sui-core/src/unit_tests/consensus_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,27 @@ use super::*;
use crate::authority::{authority_tests::init_state_with_objects, AuthorityState};
use crate::checkpoints::CheckpointServiceNoop;
use crate::consensus_handler::SequencedConsensusTransaction;
use crate::mock_consensus::with_block_status;
use consensus_core::{BlockRef, BlockStatus};
use fastcrypto::traits::KeyPair;
use move_core_types::{account_address::AccountAddress, ident_str};
use parking_lot::Mutex;
use rand::rngs::StdRng;
use rand::SeedableRng;
use parking_lot::Mutex;
use sui_network::tonic;
use sui_types::crypto::{deterministic_random_account_key, AccountKeyPair};
use sui_types::gas::GasCostSummary;
use sui_types::messages_checkpoint::{
CheckpointContents, CheckpointSignatureMessage, CheckpointSummary, SignedCheckpointSummary,
};
use sui_types::transaction::TEST_ONLY_GAS_UNIT_FOR_OBJECT_BASICS;
use sui_types::utils::{make_committee_key, to_sender_signed_transaction};
use sui_types::SUI_FRAMEWORK_PACKAGE_ID;
use sui_types::{
base_types::{ExecutionDigests, ObjectID, SuiAddress},
object::Object,
transaction::{CallArg, CertifiedTransaction, ObjectArg, TransactionData, VerifiedTransaction},
transaction::{
CallArg, CertifiedTransaction, ObjectArg, TransactionData, VerifiedTransaction,
TEST_ONLY_GAS_UNIT_FOR_OBJECT_BASICS,
},
};

/// Fixture: a few test gas objects.
Expand Down

0 comments on commit 267ef47

Please sign in to comment.