Skip to content

Commit 4b359ad

Browse files
committed
Relicense
1 parent 442d41b commit 4b359ad

File tree

7 files changed

+39
-671
lines changed

7 files changed

+39
-671
lines changed

Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
[package]
22
authors = ["Tyler Cook"]
3-
description = "Cryptocurrency for commits!"
3+
description = "Turning commits into cryptocurrency"
44
edition = "2021"
5-
license = "AGPL-3.0-only"
5+
license = "Unlicense"
66
name = "git-turbine"
77
repository = "https://github.com/fossable/turbine"
88
rust-version = "1.74"
99
version = "0.0.4"
1010

11+
[lib]
12+
name = "git_turbine"
13+
path = "src/lib.rs"
14+
1115
[[bin]]
1216
name = "turbine"
1317
path = "src/main.rs"

LICENSE.txt

Lines changed: 0 additions & 661 deletions
This file was deleted.

UNLICENSE

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
This is free and unencumbered software released into the public domain.
2+
3+
Anyone is free to copy, modify, publish, use, compile, sell, or
4+
distribute this software, either in source code form or as a compiled
5+
binary, for any purpose, commercial or non-commercial, and by any
6+
means.
7+
8+
In jurisdictions that recognize copyright laws, the author or authors
9+
of this software dedicate any and all copyright interest in the
10+
software to the public domain. We make this dedication for the benefit
11+
of the public at large and to the detriment of our heirs and
12+
successors. We intend this dedication to be an overt act of
13+
relinquishment in perpetuity of all present and future rights to this
14+
software under copyright law.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.
23+
24+
For more information, please refer to <https://unlicense.org/>

src/api/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use axum_macros::debug_handler;
99
use cached::proc_macro::once;
1010
use rust_embed::Embed;
1111
use std::time::Duration;
12+
use tracing::{debug, error, info};
1213

1314
#[derive(Debug, Clone, Default)]
1415
pub struct RepoUrl(String);

src/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use axum::{
66
};
77
use chrono::Utc;
88
use clap::Args;
9-
use std::{process::ExitCode, sync::Arc};
9+
use std::{path::PathBuf, process::ExitCode, sync::Arc};
1010

1111
use tokio::{net::TcpListener, sync::Mutex};
1212
use tokio_schedule::{every, Job};

src/repo.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ impl TurbineRepo {
171171
{
172172
// Try to find the matching commit by checking subaddress indices
173173
// The transfer's subaddr_index should match a commit's derived subaddress
174-
let commit_info = if let Some(subaddr_indices) = &transfer.subaddr_index {
174+
let commit_info = {
175175
// Find which commit maps to this subaddress index
176176
contributor.commits.iter()
177177
.find(|commit_id| {
178178
let derived_index = crate::currency::monero::commit_to_subaddress_index(**commit_id);
179-
subaddr_indices.minor == derived_index
179+
transfer.subaddr_index.minor == derived_index
180180
})
181181
.and_then(|commit_id| {
182182
// Get the commit from the repo
@@ -190,8 +190,6 @@ impl TurbineRepo {
190190
(commit_id.to_string(), message)
191191
})
192192
})
193-
} else {
194-
None
195193
};
196194

197195
let (commit_id, commit_message) = commit_info.unwrap_or_else(|| {

tests/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
FROM debian:bookworm-slim AS monero_setup
2+
3+
COPY monero_setup.sh .
4+
RUN ./monero_setup.sh
5+
16
FROM fossable/turbine:latest
27

38
COPY gpg_setup.sh .
49
RUN ./gpg_setup.sh
510

6-
COPY monero_setup.sh .
7-
RUN ./monero_setup.sh
8-
911
COPY entrypoint.sh /
1012
ENTRYPOINT [ "/entrypoint.sh" ]

0 commit comments

Comments
 (0)