Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/service persistence #171

Merged
merged 80 commits into from
Apr 17, 2020
Merged
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
5ac7454
validator: adding Diesel ORM
futurechimp Mar 17, 2020
e30f3f7
validator: making sure Iron::status is always avaialable
futurechimp Mar 17, 2020
516a32a
ibid
futurechimp Mar 17, 2020
b398c5c
validator: presence-announcement REST API
futurechimp Mar 17, 2020
6dbc755
validator: adding Diesel setup
futurechimp Mar 17, 2020
fd103cd
Removing Diesel stuff from root of monorepo
futurechimp Mar 17, 2020
a0993b4
validator: adding Diesel migrations and setup
futurechimp Mar 17, 2020
6d8f443
validator: documenting how PresenceAnnouncement is different from pre…
futurechimp Mar 17, 2020
03f37f6
validator: added Chrono crate for datetime conversions into sql
futurechimp Mar 17, 2020
53665e3
validator: restructured the presence module
futurechimp Mar 17, 2020
6609439
validator: removed presence announcements from persistence
futurechimp Mar 17, 2020
342bef8
validator: commenting topology
futurechimp Mar 17, 2020
e7cef03
Adding staking to the mixmining service
futurechimp Mar 17, 2020
8c0fca5
Start of mixmining + stake service
futurechimp Mar 17, 2020
73a05ec
validator: added a bit about mixmining to README
futurechimp Mar 17, 2020
97b6a0e
validator: added Iron's params crate
futurechimp Mar 17, 2020
0d17414
validator: reorganized mixmining service and db code
futurechimp Mar 17, 2020
e7730c3
Merge branch 'develop' into feature/diesel-persistence
futurechimp Mar 25, 2020
0d0bc33
validator: no need for this .env warning
futurechimp Mar 25, 2020
7bd7ede
validator: removing params parser, it's now unused
futurechimp Mar 25, 2020
d5eed7e
validator: adding json body parser library for Iron
futurechimp Mar 25, 2020
656f79a
validator: adding spelling exceptions
futurechimp Mar 25, 2020
1a4a43f
validator: adding bodyparser deps
futurechimp Mar 25, 2020
397853c
validator: ability to (de)serialize Mixnode struct
futurechimp Mar 25, 2020
1343af0
validator: further announcement HTTP progress
futurechimp Mar 25, 2020
cb349aa
validator: simplified announcement route
futurechimp Mar 25, 2020
8235ccc
validator: injecting database and service into handler
futurechimp Mar 25, 2020
85397d4
validator: renaming service and db variables
futurechimp Mar 25, 2020
9ff3420
validator: using camelCase json
futurechimp Mar 25, 2020
131e976
validator: using base Iron handler rather than middleware handler
futurechimp Mar 25, 2020
9a96713
validator: better error message on unexpected json parsing
futurechimp Mar 25, 2020
2543516
validator: adding 'location' to presence::Announcement
futurechimp Mar 25, 2020
21bd0e8
comments on mixmining::Db
futurechimp Mar 25, 2020
614b60a
validator: commenting out unused mixmining::Service methods for the m…
futurechimp Mar 25, 2020
9bfa746
validator: noting that we don't yet know how to measure capacity
futurechimp Mar 25, 2020
11d606a
validator: comments
futurechimp Mar 25, 2020
1cbb6f2
validator: starting to add correct serializers in rest API
futurechimp Mar 25, 2020
bdcfe81
validator: renaming a mixnode announcements
futurechimp Mar 25, 2020
a341f52
validator: extracted route creation
futurechimp Mar 26, 2020
b260879
validator: going lower-case for node in "Mixnode"
futurechimp Mar 26, 2020
44a49d1
validator: removing the "announcement" model
futurechimp Mar 26, 2020
c45e85d
validator: renamed annoucements handlers
futurechimp Mar 26, 2020
1d82585
validator: temporarily removed Chrono, remove it fully if it's not ne…
futurechimp Mar 26, 2020
9b9fed7
validator: added all the needed Mixnode fields to the service model
futurechimp Mar 26, 2020
bcac889
validator: moved models into their own file.
futurechimp Mar 26, 2020
1dd7460
validator: conversions to/from api vs service models
futurechimp Mar 26, 2020
348260c
validator: doing type conversions from rest to service models
futurechimp Mar 26, 2020
e7c11d5
validator: unused import cleanup
futurechimp Mar 26, 2020
24f9152
validator: rewrote mixmining service comments in light of recent thin…
futurechimp Mar 26, 2020
ab993d7
validator: some notes on type conversion tests
futurechimp Mar 26, 2020
a65d6b4
wip
futurechimp Mar 27, 2020
98cc48f
validator: getting capacity from db works
futurechimp Mar 31, 2020
9eecac4
wip
futurechimp Mar 31, 2020
d5dea8e
validator: eliminating borrows so we can have something pure to mutex…
futurechimp Apr 2, 2020
522ac8b
validator: a working mutex on the mixmining service
futurechimp Apr 2, 2020
76d7c6d
validator: renaming mixmining db get_capacity to capacity
futurechimp Apr 2, 2020
58c7f52
validator: making mixmining db capacity field private, using accessor
futurechimp Apr 2, 2020
6d7fb2a
validator: local capacity updates working
futurechimp Apr 2, 2020
eba02a0
validator: starting REST API for staking
futurechimp Apr 2, 2020
04d2ac0
validator: fixing clippy warning
futurechimp Apr 2, 2020
dd854d3
validator: minor naming fixes on mixmining service
futurechimp Apr 2, 2020
e43b950
validator: service mixnode and rest mixnode + topology conversions + …
futurechimp Apr 3, 2020
c0231ab
validator: renaming mix_nodes to mixnodes for consistency
futurechimp Apr 3, 2020
afa624c
validator: test fixtures for mixnode
futurechimp Apr 3, 2020
5997556
validator: moved service models into their own file
futurechimp Apr 3, 2020
f81441e
validator: a properly-structured toplogy route
futurechimp Apr 3, 2020
4d4ecb9
validator: topology retrieval
futurechimp Apr 3, 2020
cf5e7bb
validator: killed test fixture warning
futurechimp Apr 3, 2020
b685903
validator: getting set for topology equality checks (testing purposes)
futurechimp Apr 3, 2020
324a6c4
validator: otherway conversions for topology and mixnode types
futurechimp Apr 3, 2020
66bda28
validator: initial topology retrieval working
futurechimp Apr 3, 2020
535ae4a
validator: ditching go-ish variable name :)
futurechimp Apr 3, 2020
d7be512
ibid
futurechimp Apr 3, 2020
36fdbb5
Merge branch 'develop' into feature/service-persistence
futurechimp Apr 3, 2020
36d4f04
validator: added a StakeUpdate struct to get around cargo fmt failing
futurechimp Apr 3, 2020
8737a0e
validator: commenting out struct so kill warning
futurechimp Apr 3, 2020
1986839
Ignoring validator vscode settings
futurechimp Apr 6, 2020
c547751
ibid
futurechimp Apr 6, 2020
2da3a8b
ibid
futurechimp Apr 6, 2020
a4ec792
Merge branch 'develop' into feature/service-persistence
futurechimp Apr 17, 2020
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
Prev Previous commit
Next Next commit
validator: minor naming fixes on mixmining service
futurechimp committed Apr 2, 2020
commit dd854d3e7138d6650f8c8de59f7796f1ca87fe19
9 changes: 4 additions & 5 deletions validator/src/services/mixmining/mod.rs
Original file line number Diff line number Diff line change
@@ -104,11 +104,11 @@ pub struct Mixnode {
}

#[cfg(test)]
mod test_constructor {
mod constructor {
use super::*;

#[test]
fn test_constructor_sets_database() {
fn sets_database() {
let db = db::MixminingDb::new();
let service = Service::new(db.clone());

@@ -117,22 +117,21 @@ mod test_constructor {
}

#[cfg(test)]
mod test_capacity {
mod capacity {
use super::*;

#[test]
fn setting_capacity_sends_correct_value_to_datastore() {
let mock_db = db::MixminingDb::new();
let mut service = Service::new(mock_db);
let cap = 3;

service.set_capacity(3);

assert_eq!(3, service.capacity());
}

#[test]
fn test_getting_capacity() {
fn getting_capacity_works() {
let mut mock_db = db::MixminingDb::new();
mock_db.set_capacity(3);
let service = Service::new(mock_db);