Skip to content

Commit

Permalink
Add SPDX license headers to all files, correct license to `AGPL-3.0-o…
Browse files Browse the repository at this point in the history
…r-later` (#36)

* Use published bamboo-rs-core crate, update dependencies

* Add SPDX license headers to all files

* Update LICENSE

* Update license in README.md

* Correct license in Cargo.toml
  • Loading branch information
adzialocha authored Sep 8, 2021
1 parent 4618e31 commit 4826710
Show file tree
Hide file tree
Showing 26 changed files with 53 additions and 15 deletions.
8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -629,12 +629,12 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
aquadoggo, a p2panda reference node implementation.
Copyright (C) 2021 p2panda contributors

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,4 @@ $ cargo add aquadoggo

## License

GNU Affero General Public License v3.0 [`AGPL-3.0`]

[`AGPL-3.0`]: LICENSE
GNU Affero General Public License v3.0 [`AGPL-3.0-or-later`](LICENSE)
2 changes: 1 addition & 1 deletion aquadoggo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = [
"sandreae <[email protected]>",
"cafca <[email protected]>"
]
license = "AGPL-3.0-only"
license = "AGPL-3.0-or-later"
repository = "https://github.com/p2panda/aquadoggo"
readme = "README.md"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion aquadoggo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ cargo test

## License

GNU Affero General Public License v3.0 `AGPL-3.0`
GNU Affero General Public License v3.0 [`AGPL-3.0-or-later`](LICENSE)
2 changes: 2 additions & 0 deletions aquadoggo/src/config.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use std::fs;
use std::path::PathBuf;

Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/db/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use anyhow::{Error, Result};
use sqlx::any::{Any, AnyPool, AnyPoolOptions};
use sqlx::migrate;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/db/models/entry.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use p2panda_rs::entry::{EntrySigned, LogId, SeqNum};
use p2panda_rs::message::MessageEncoded;
use p2panda_rs::hash::Hash;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/db/models/log.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use p2panda_rs::entry::LogId;
use p2panda_rs::identity::Author;
use p2panda_rs::hash::Hash;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/db/models/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

mod entry;
mod log;

Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/errors.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use p2panda_rs::entry::{EntryError, EntrySignedError};
use p2panda_rs::hash::HashError;
use p2panda_rs::message::{MessageEncodedError, MessageError};
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

//! # aquadoggo
#![warn(
missing_copy_implementations,
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/api.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use std::sync::Arc;

use jsonrpc_v2::{Data, MapRouter, Server as Service};
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/methods/entry_args.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use bamboo_rs_core::entry::is_lipmaa_required;
use jsonrpc_v2::{Data, Params};
use p2panda_rs::entry::SeqNum;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/methods/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

mod entry_args;
mod publish_entry;
mod query_entries;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/methods/publish_entry.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use jsonrpc_v2::{Data, Params};
use p2panda_rs::entry::decode_entry;
use p2panda_rs::message::Message;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/methods/query_entries.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use jsonrpc_v2::{Data, Params};
use p2panda_rs::Validate;

Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

mod api;
mod methods;
mod request;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/request.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use serde::Deserialize;

use p2panda_rs::entry::EntrySigned;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/response.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use serde::Serialize;

use crate::db::models::Entry;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/rpc/server.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use std::net::{IpAddr, Ipv4Addr, SocketAddr};

use async_std::stream::StreamExt;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/runtime.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use anyhow::Result;

use crate::config::Configuration;
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/task.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use std::error::Error;

use async_std::{future::Future, task};
Expand Down
2 changes: 2 additions & 0 deletions aquadoggo/src/test_helpers.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use p2panda_rs::hash::Hash;
use rand::Rng;
use sqlx::any::Any;
Expand Down
10 changes: 5 additions & 5 deletions aquadoggo_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
name = "aquadoggo_cli"
version = "0.1.0"
authors = [
"sophiiistika <[email protected]>",
"adz <[email protected]>",
"sandreae <[email protected]>",
"cafca <[email protected]>"
"sophiiistika <[email protected]>",
"adz <[email protected]>",
"sandreae <[email protected]>",
"cafca <[email protected]>"
]
license = "AGPL-3.0-only"
license = "AGPL-3.0-or-later"
repository = "https://github.com/p2panda/aquadoggo"
readme = "README.md"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion aquadoggo_cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ cargo build

## License

GNU Affero General Public License v3.0 `AGPL-3.0`
GNU Affero General Public License v3.0 [`AGPL-3.0-or-later`](LICENSE)
2 changes: 2 additions & 0 deletions aquadoggo_cli/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

use async_ctrlc::CtrlC;
use async_std::task;
use structopt::StructOpt;
Expand Down

0 comments on commit 4826710

Please sign in to comment.