Skip to content

Commit 3c0c3f0

Browse files
committed
merge master
2 parents 142de41 + a0bf993 commit 3c0c3f0

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

.github/workflows/cache-factory.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- uses: dtolnay/rust-toolchain@stable
2424

25-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
25+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
2626
with:
2727
shared-key: stable-cache
2828

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- uses: dtolnay/rust-toolchain@stable
3838

39-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
39+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
4040
with:
4141
shared-key: stable-cache
4242
save-if: false
@@ -145,7 +145,7 @@ jobs:
145145

146146
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
147147

148-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
148+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
149149
with:
150150
key: ${{ matrix.target }}
151151
save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -170,7 +170,7 @@ jobs:
170170

171171
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
172172

173-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
173+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
174174
with:
175175
save-if: ${{ github.ref == 'refs/heads/master' }}
176176

@@ -190,7 +190,7 @@ jobs:
190190

191191
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
192192

193-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
193+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
194194
with:
195195
key: ${{ matrix.features }}
196196
save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -207,7 +207,7 @@ jobs:
207207

208208
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
209209

210-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
210+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
211211
with:
212212
save-if: ${{ github.ref == 'refs/heads/master' }}
213213

@@ -233,7 +233,7 @@ jobs:
233233

234234
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
235235

236-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
236+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
237237
with:
238238
save-if: ${{ github.ref == 'refs/heads/master' }}
239239

@@ -249,7 +249,7 @@ jobs:
249249

250250
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
251251

252-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
252+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
253253
with:
254254
save-if: ${{ github.ref == 'refs/heads/master' }}
255255

@@ -268,7 +268,7 @@ jobs:
268268

269269
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
270270

271-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
271+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
272272
with:
273273
shared-key: stable-cache
274274
save-if: false
@@ -359,7 +359,7 @@ jobs:
359359
steps:
360360
- uses: actions/checkout@v5
361361

362-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
362+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
363363

364364
- run: cargo install --version 0.10.0 pb-rs --locked
365365

@@ -385,7 +385,7 @@ jobs:
385385
runs-on: ubuntu-latest
386386
steps:
387387
- uses: actions/checkout@v5
388-
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
388+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
389389
- run: cargo metadata --locked --format-version=1 > /dev/null
390390

391391
cargo-deny:

identity/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 0.2.12
1+
## 0.2.13
22

33
- Turn the `quick-protobuf` dependency optional to only the features which require it.
44
See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/XXXX)

protocols/gossipsub/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919

2020
- Fix incorrect default values in ConfigBuilder
2121
See [PR 6113](https://github.com/libp2p/rust-libp2p/pull/6113)
22-
22+
2323
- Remove duplicated config `set_topic_max_transmit_size` method, prefer `max_transmit_size_for_topic`.
2424
See [PR 6173](https://github.com/libp2p/rust-libp2p/pull/6173).
2525

2626
- Switch the internal `async-channel` used to dispatch messages from `NetworkBehaviour` to the `ConnectionHandler`
2727
with an internal priority queue. See [PR 6175](https://github.com/libp2p/rust-libp2p/pull/6175)
2828

29+
- gossipsub: do early return in for an empty input
30+
See [PR 6208](https://github.com/libp2p/rust-libp2p/pull/6208).
31+
2932
## 0.49.2
3033

3134
- Relax `Behaviour::with_metrics` requirements, do not require DataTransform and TopicSubscriptionFilter to also impl Default

protocols/gossipsub/src/queue.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ impl Queue {
8181
/// Remove pending low priority Publish and Forward messages.
8282
/// Returns the number of messages removed.
8383
pub(crate) fn remove_data_messages(&mut self, message_ids: &[MessageId]) -> usize {
84+
if message_ids.is_empty() {
85+
return 0;
86+
}
87+
8488
let mut count = 0;
8589
self.non_priority.retain(|message| match message {
8690
RpcOut::Publish { message_id, .. } | RpcOut::Forward { message_id, .. } => {

0 commit comments

Comments
 (0)