Skip to content

Commit 2e7394a

Browse files
authored
Merge pull request #1984 from mintlayer/prepare-release-v1.2.0
Prepare release v1.2.0
2 parents 31c24b9 + ed470ba commit 2e7394a

File tree

69 files changed

+406
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+406
-239
lines changed

Cargo.lock

Lines changed: 95 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ homepage = "https://mintlayer.org"
55
repository = "https://github.com/mintlayer/mintlayer-core"
66
readme = "README.md"
77
license = "MIT"
8-
version = "1.1.0"
8+
version = "1.2.0"
99
authors = ["Samer Afach <[email protected]>", "Ben Marsh <[email protected]>", "Enrico Rubboli <[email protected]>"]
1010
edition = "2021"
1111

@@ -127,7 +127,7 @@ utxo = { path = "utxo" }
127127
[workspace.package]
128128
edition = "2021"
129129
rust-version = "1.88"
130-
version = "1.1.0"
130+
version = "1.2.0"
131131
license = "MIT"
132132

133133
[workspace.dependencies]

api-server/api-server-common/src/storage/impls/postgres/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl TransactionalApiServerPostgresStorage {
116116

117117
pub async fn begin_ro_transaction(
118118
&self,
119-
) -> Result<ApiServerPostgresTransactionalRo, ApiServerStorageError> {
119+
) -> Result<ApiServerPostgresTransactionalRo<'_>, ApiServerStorageError> {
120120
let conn = self
121121
.pool
122122
.get_owned()
@@ -132,7 +132,7 @@ impl TransactionalApiServerPostgresStorage {
132132

133133
pub async fn begin_rw_transaction(
134134
&self,
135-
) -> Result<ApiServerPostgresTransactionalRw, ApiServerStorageError> {
135+
) -> Result<ApiServerPostgresTransactionalRw<'_>, ApiServerStorageError> {
136136
let conn = self
137137
.pool
138138
.get_owned()

api-server/stack-test-suite/tests/v2/nft.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,12 @@ async fn ok(#[case] seed: Seed) {
100100
0,
101101
);
102102

103-
let token_id =
104-
make_token_id(&chain_config, tf.next_block_height(), &[input.clone()]).unwrap();
103+
let token_id = make_token_id(
104+
&chain_config,
105+
tf.next_block_height(),
106+
std::slice::from_ref(&input),
107+
)
108+
.unwrap();
105109

106110
// issue NFT
107111
let issue_nft_tx = TransactionBuilder::new()

blockprod/src/detail/timestamp_searcher/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ mod collect_search_data {
483483
amount_to_delegate
484484
}
485485

486-
fn make_block_builder(tf: &mut TestFramework) -> PoSBlockBuilder {
486+
fn make_block_builder(tf: &mut TestFramework) -> PoSBlockBuilder<'_> {
487487
tf.make_pos_block_builder().with_specific_staking_pool(&H256::zero().into())
488488
}
489489
}

build-tools/docker/example-mainnet-dns-server/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet-dns-server
44

55
# Dockerhub username, from which the docker images will be pulled.
66
ML_DOCKERHUB_USERNAME=mintlayer
7-
# The image tag to use, e.g. "v1.1.0" or "latest".
7+
# The image tag to use, e.g. "v1.2.0" or "latest".
88
ML_DOCKER_IMAGE_TAG=latest
99

1010
# The user and group ids that will be used to run the software.

build-tools/docker/example-mainnet/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet
44

55
# Dockerhub username, from which the docker images will be pulled.
66
ML_DOCKERHUB_USERNAME=mintlayer
7-
# The image tag to use, e.g. "v1.1.0" or "latest".
7+
# The image tag to use, e.g. "v1.2.0" or "latest".
88
ML_DOCKER_IMAGE_TAG=latest
99

1010
# The user and group ids that will be used to run the software.

chainstate/src/detail/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl<S: BlockchainStorage, V: TransactionVerificationStrategy> Chainstate<S, V>
140140
#[log_error]
141141
pub(crate) fn make_db_tx_ro(
142142
&self,
143-
) -> chainstate_storage::Result<ChainstateRef<TxRo<'_, S>, V>> {
143+
) -> chainstate_storage::Result<ChainstateRef<'_, TxRo<'_, S>, V>> {
144144
let db_tx = self.chainstate_storage.transaction_ro()?;
145145
Ok(chainstateref::ChainstateRef::new_ro(
146146
&self.chain_config,
@@ -152,7 +152,7 @@ impl<S: BlockchainStorage, V: TransactionVerificationStrategy> Chainstate<S, V>
152152
}
153153

154154
#[log_error]
155-
pub fn query(&self) -> Result<ChainstateQuery<TxRo<'_, S>, V>, PropertyQueryError> {
155+
pub fn query(&self) -> Result<ChainstateQuery<'_, TxRo<'_, S>, V>, PropertyQueryError> {
156156
self.make_db_tx_ro().map(ChainstateQuery::new).map_err(PropertyQueryError::from)
157157
}
158158

chainstate/storage/src/internal/store_tx/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl<'st, B: storage::Backend> StoreTxRw<'st, B> {
129129
// Get a key-value map
130130
fn get_map<DbMap, I>(
131131
&self,
132-
) -> crate::Result<storage::MapRef<storage::TransactionRw<'st, B, Schema>, DbMap>>
132+
) -> crate::Result<storage::MapRef<'_, storage::TransactionRw<'st, B, Schema>, DbMap>>
133133
where
134134
DbMap: schema::DbMap,
135135
Schema: schema::HasDbMap<DbMap, I>,

chainstate/test-framework/src/framework.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ impl TestFramework {
9898
}
9999

100100
/// Returns a block builder instance that can be used for block construction and processing.
101-
pub fn make_block_builder(&mut self) -> BlockBuilder {
101+
pub fn make_block_builder(&mut self) -> BlockBuilder<'_> {
102102
BlockBuilder::new(self)
103103
}
104104

105-
pub fn make_pos_block_builder(&mut self) -> PoSBlockBuilder {
105+
pub fn make_pos_block_builder(&mut self) -> PoSBlockBuilder<'_> {
106106
PoSBlockBuilder::new(self)
107107
}
108108

0 commit comments

Comments
 (0)