Merge pull request #267 from AdExNetwork/issue-266-long-cmd-arguments

Issue #266 long cmd arguments

Author: samparsky

primitives/src/util/tests/prep_db.rs

@@ -1,4 +1,5 @@
 use crate::{
+    channel::{Pricing, PricingBounds},
     BigNum, Channel, ChannelId, ChannelSpec, EventSubmission, SpecValidators, ValidatorDesc,
     ValidatorId,
 };
@@ -69,7 +70,7 @@ lazy_static! {
                 title: None,
                 validators: SpecValidators::new(DUMMY_VALIDATOR_LEADER.clone(), DUMMY_VALIDATOR_FOLLOWER.clone()),
                 max_per_impression: 10.into(),
-                min_per_impression: 10.into(),
+                min_per_impression: 1.into(),
                 targeting: vec![],
                 min_targeting_score: None,
                 event_submission: Some(EventSubmission { allow: vec![] }),
@@ -79,7 +80,7 @@ lazy_static! {
                 nonce: Some(nonce),
                 withdraw_period_start: Utc.timestamp_millis(4_073_414_400_000),
                 ad_units: vec![],
-                pricing_bounds: None,
+                pricing_bounds: Some(PricingBounds {impression: None, click: Some(Pricing { max: 0.into(), min: 0.into()})}),
             },
         }
     };

sentry/src/main.rs

@@ -28,6 +28,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         )
         .arg(
             Arg::with_name("adapter")
+                .long("adapter")
                 .short("a")
                 .help("the adapter for authentication and signing")
                 .required(true)
@@ -37,18 +38,21 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         )
         .arg(
             Arg::with_name("keystoreFile")
+                .long("keystoreFile")
                 .short("k")
                 .help("path to the JSON Ethereum Keystore file")
                 .takes_value(true),
         )
         .arg(
             Arg::with_name("dummyIdentity")
+                .long("dummyIdentity")
                 .short("i")
                 .help("the identity to use with the dummy adapter")
                 .takes_value(true),
         )
         .arg(
             Arg::with_name("clustered")
+                .long("clustered")
                 .short("c")
                 .help("Run app in cluster mode with multiple workers"),
         )

validator_worker/src/main.rs

@@ -36,6 +36,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         )
         .arg(
             Arg::with_name("adapter")
+                .long("adapter")
                 .short("a")
                 .help("the adapter for authentication and signing")
                 .required(true)
@@ -45,18 +46,21 @@ fn main() -> Result<(), Box<dyn Error>> {
         )
         .arg(
             Arg::with_name("keystoreFile")
+                .long("keystoreFile")
                 .short("k")
                 .help("path to the JSON Ethereum Keystore file")
                 .takes_value(true),
         )
         .arg(
             Arg::with_name("dummyIdentity")
+                .long("dummyIdentity")
                 .short("i")
                 .help("the identity to use with the dummy adapter")
                 .takes_value(true),
         )
         .arg(
             Arg::with_name("sentryUrl")
+                .long("sentryUrl")
                 .short("u")
                 .help("the URL to the sentry used for listing channels")
                 .default_value("http://127.0.0.1:8005")
@@ -65,6 +69,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         )
         .arg(
             Arg::with_name("singleTick")
+                .long("singleTick")
                 .short("t")
                 .takes_value(false)
                 .help("runs the validator in single-tick mode and exit"),