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
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ jobs:
toolchain: [stable, beta, nightly]
steps:
- name: Checkout sources
uses: actions/checkout@v4
uses: actions/checkout@v6
- run: rustup update ${{ matrix.toolchain }}
- run: rustup default ${{ matrix.toolchain }}
- run: cargo check --all

test:
Expand All @@ -23,19 +24,22 @@ jobs:
toolchain: [stable, beta, nightly]
steps:
- name: Checkout sources
uses: actions/checkout@v4
uses: actions/checkout@v6
- run: rustup update ${{ matrix.toolchain }}
- run: rustup default ${{ matrix.toolchain }}
- run: cargo test --all

lints:
name: Lints
runs-on: ubuntu-latest
strategy:
matrix:
toolchain: [stable, beta, nightly]
toolchain: [stable]
steps:
- name: Checkout sources
uses: actions/checkout@v4
uses: actions/checkout@v6
- run: rustup update ${{ matrix.toolchain }}
- run: rustup default ${{ matrix.toolchain }}
- run: rustup component add rustfmt clippy
- run: cargo fmt --all -- --check
- run: cargo clippy --all -- -D warnings
- run: cargo clippy --all --all-targets -- -D warnings
31 changes: 31 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Create GitHub Release and Publish to crates.io

on:
push:
tags: ['v*']

jobs:
github-release:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v6
- id: create-release
run: gh release create ${{ github.ref_name }} --title "${{ github.ref_name }}" --generate-notes
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish:
needs: github-release
runs-on: ubuntu-latest
# environment: release # Optional: for enhanced security
permissions:
id-token: write
steps:
- uses: actions/checkout@v6
- uses: rust-lang/crates-io-auth-action@v1
id: auth
- run: cargo publish
env:
CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/sile/plumtree"
readme = "README.md"
license = "MIT"
categories = ["algorithms"]
edition = "2021"
edition = "2024"

[dev-dependencies]
rand = "0.9"
2 changes: 1 addition & 1 deletion src/action.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::message::{Message, ProtocolMessage};
use crate::System;
use crate::message::{Message, ProtocolMessage};
use std::collections::VecDeque;
use std::fmt;

Expand Down
2 changes: 1 addition & 1 deletion src/missing.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::System;
use crate::message::IhaveMessage;
use crate::time::{Clock, NodeTime};
use crate::System;
use std::cmp::Ordering;
use std::collections::{BinaryHeap, HashMap};
use std::fmt;
Expand Down
14 changes: 7 additions & 7 deletions src/node.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use crate::System;
use crate::action::{Action, ActionQueue};
use crate::message::{
GossipMessage, GraftMessage, IhaveMessage, Message, ProtocolMessage, PruneMessage,
};
use crate::missing::MissingMessages;
use crate::time::{Clock, NodeTime};
use crate::System;
use std::collections::{HashMap, HashSet};
use std::fmt;
use std::time::Duration;
Expand Down Expand Up @@ -304,12 +304,12 @@ impl<T: System> Node<T> {
fn handle_graft(&mut self, mut graft: GraftMessage<T>) {
self.eager_push_peers.insert(graft.sender.clone());
self.lazy_push_peers.remove(&graft.sender);
if let Some(message_id) = graft.message_id.take() {
if let Some(payload) = self.messages.get(&message_id).cloned() {
let gossip =
GossipMessage::new(&self.id, Message::new(message_id, payload), graft.round);
self.actions.send(graft.sender, gossip);
}
if let Some(message_id) = graft.message_id.take()
&& let Some(payload) = self.messages.get(&message_id).cloned()
{
let gossip =
GossipMessage::new(&self.id, Message::new(message_id, payload), graft.round);
self.actions.send(graft.sender, gossip);
}
}

Expand Down