Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 43 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ iota-rosetta = { path = "crates/iota-rosetta" }
iota-rpc-loadgen = { path = "crates/iota-rpc-loadgen" }
iota-sdk = { path = "crates/iota-sdk" }
# core-types with json format for REST API
iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "6bb6e45fea2c266f9c15dd89f26f68631c2d37a8", features = ["hash", "serde", "schemars"] }
iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "cd97687c9316045351d7db8b389ea381a5c335e1", features = ["hash", "serde", "schemars"] }
iota-simulator = { path = "crates/iota-simulator" }
iota-snapshot = { path = "crates/iota-snapshot" }
iota-source-validation = { path = "crates/iota-source-validation" }
Expand Down
6 changes: 5 additions & 1 deletion crates/iota-benchmark/src/workloads/batch_payment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ const PRIMARY_COIN_VALUE: u64 = 100 * NANOS_PER_IOTA;
/// Number of nanos sent to each address on each batch transfer
const BATCH_TRANSFER_AMOUNT: u64 = 1;

const DUMMY_GAS: ObjectRef = (ObjectID::ZERO, SequenceNumber::MIN, ObjectDigest::MIN);
const DUMMY_GAS: ObjectRef = (
ObjectID::ZERO,
SequenceNumber::MIN_VALID_INCL,
ObjectDigest::MIN,
);

#[derive(Debug)]
pub struct BatchPaymentTestPayload {
Expand Down
5 changes: 4 additions & 1 deletion crates/iota-benchmark/tests/simtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,10 @@ mod test {
let num_objs = thread_rng().gen_range(1..15);
let mut assigned_object_versions = Vec::new();
for _ in 0..num_objs {
assigned_object_versions.push((ObjectID::random(), SequenceNumber::CONGESTED));
assigned_object_versions.push((
ObjectID::random(),
SequenceNumber::new_congested_with_suggested_gas_price(1_000),
));
}
additional_cancelled_txns.push((TransactionDigest::random(), assigned_object_versions));
}
Expand Down
1 change: 1 addition & 0 deletions crates/iota-core/src/authority.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ pub mod authority_store_types;
pub mod epoch_start_configuration;
pub mod shared_object_congestion_tracker;
pub mod shared_object_version_manager;
pub mod suggested_gas_price_calculator;
pub mod test_authority_builder;
pub mod transaction_deferral;

Expand Down
Loading
Loading