Skip to content

AIP#31 impl changes for all crates #313

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

Merged
merged 36 commits into from
Nov 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
822898f
Remove fields made obslote by AIP#31
elpiel Jun 29, 2020
edf2962
WIP remove obsolete fields
elpiel Jun 29, 2020
b5cdf52
Merge branch 'dev' into aip-31-remove-obsolete-fields
elpiel Jul 21, 2020
40e587b
Clean usage of TargetingTag
elpiel Jul 21, 2020
8e43d6f
Merge branch 'supermarket-changes' into aip-31-remove-obsolete-fields
elpiel Jul 21, 2020
808dc07
Merge branch 'supermarket-changes' into aip-31-remove-obsolete-fields
elpiel Jul 24, 2020
14062ae
Merge branch 'supermarket-changes' into aip-31-remove-obsolete-fields
elpiel Jul 24, 2020
5c054f9
adview-manager - Cargo - add lazy_static
elpiel Jul 24, 2020
f908234
WIP payouts, analytics recorder, event aggregator, event reducer
elpiel Jul 24, 2020
e514c09
WIP adview-manager
elpiel Jul 24, 2020
f5fdb55
Merge branch 'dev' into aip-31-remove-obsolete-fields
elpiel Jul 27, 2020
9a245a1
Input Source & Map
elpiel Jul 30, 2020
f90aaf3
adview-manager - Cargo - add some deps
elpiel Aug 3, 2020
c417756
WIP #312 #323 #322 #319
elpiel Aug 21, 2020
8b4d81e
adview-manager - randomized_sort_pos
elpiel Aug 27, 2020
ae6b87e
fix payout & event_reducer test
elpiel Aug 27, 2020
6b9c39e
payout::get_payout - test
elpiel Aug 28, 2020
913aad3
Merge branch 'dev' into aip-31-remove-obsolete-fields
elpiel Sep 3, 2020
c3325fd
primitives - targeting - eval - add Logging for TypeError
elpiel Sep 4, 2020
e8f8a90
sentry - analytics_recorder - check TODO and impl changes
elpiel Sep 8, 2020
bcd50c5
Merge branch 'ipfs-struct' into aip-31-remove-obsolete-fields
elpiel Sep 11, 2020
545c157
sentry - analytics_recorder - pass Logger to get_payout
elpiel Sep 11, 2020
2d7fbed
primitives - ipfs - fix test
elpiel Sep 14, 2020
ba2a94f
Cargo.toml - primitives, adview-manager, sentry, validator_worker - U…
elpiel Sep 15, 2020
6886452
primitives - AdUnit - use `primitives::IPFS`
elpiel Sep 15, 2020
6a5150d
adview-manager - use `primitives::IPFS` & impl `randomized_sort_pos`
elpiel Sep 15, 2020
69fba79
adapter - Cargo - update `hex` to `0.4`
elpiel Sep 16, 2020
7bfa1c1
primitives - IPFS - V0 != V1 test
elpiel Sep 16, 2020
7fd8a4b
More changes regarding IPFS
elpiel Sep 16, 2020
fa5f614
Merge branch 'dev' into aip-31-remove-obsolete-fields
elpiel Sep 17, 2020
a55636e
primitives - targeting - eval - Value serialize to serde_json::Value
elpiel Oct 20, 2020
cb89066
derive Eq & PartialEq for primitives
elpiel Oct 20, 2020
72059fa
primitives - supermarket - derive(PartialEq)
elpiel Oct 23, 2020
665bebb
added total field and pages field to ChannelListResponse
simzzz Oct 26, 2020
9928290
manually getting current page instead of passing the variable around
simzzz Oct 26, 2020
c00f6aa
Merge pull request #341 from AdExNetwork/issue-337-align-channellist-…
simzzz Oct 28, 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
570 changes: 319 additions & 251 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions adapter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Lachezar Lechev <[email protected]>, Omidiora Samuel <[email protected]
edition = "2018"

[dependencies]
primitives = {path = "../primitives"}
primitives = { path = "../primitives" }
# Time handling
chrono = "0.4"
# To/From Hex
hex = "0.3.2"
serde = {version = "^1.0", features = ['derive']}
hex = "0.4"
serde = { version = "^1.0", features = ['derive'] }
serde_json = "1.0"
serde-hex = "0.1.0"
# Ethereum
Expand Down
4 changes: 0 additions & 4 deletions adapter/src/ethereum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -673,18 +673,14 @@ mod test {
validators: SpecValidators::new(leader_validator_desc, follower_validator_desc),
max_per_impression: 10.into(),
min_per_impression: 10.into(),
targeting: vec![],
targeting_rules: vec![],
min_targeting_score: None,
event_submission: Some(EventSubmission { allow: vec![] }),
created: Utc::now(),
active_from: None,
nonce: None,
withdraw_period_start: Utc::now() + Duration::days(1),
ad_units: vec![],
pricing_bounds: None,
price_multiplication_rules: Default::default(),
price_dynamic_adjustment: false,
},
};

Expand Down
14 changes: 13 additions & 1 deletion adview-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,20 @@ name = "adview-manager"
version = "0.1.0"

[dependencies]
# Domain
adex_primitives = {path = "../primitives", package = "primitives"}
chrono = "0.4"
num-bigint = {version = "0.3", features = ["serde"]}
num-integer = "0.1"
# (De)Serialization & Http requests
serde = {version = "^1.0", features = ['derive']}
serde_json = "^1.0"
reqwest = { version = "0.10", features = ["json"] }
url = { version = "^2.1", features = ["serde"]}
# Logging
slog = { version = "^2.5.2" , features = ["max_level_trace"] }
# Async
async-std = "1.6"
# Other
lazy_static = "1.4"
thiserror = "^1.0"
rand = "0.7"
Loading