Merge pull request #94 from yrashk/accounts-deprecation

Problem: authorities.accounts config setting is obsolete

README.md

@@ -94,11 +94,6 @@ required_confirmations = 0
 password = "foreign_password.txt"
 
 [authorities]
-accounts = [
-    "0x006e27b6a72e1f34c626762f3c4761547aff1421",
-    "0x006e27b6a72e1f34c626762f3c4761547aff1421",
-    "0x006e27b6a72e1f34c626762f3c4761547aff1421"
-]
 required_signatures = 2
 
 [transactions]

bridge/src/config.rs

@@ -50,6 +50,7 @@ impl Config {
 			home: Node::from_load_struct(config.home)?,
 			foreign: Node::from_load_struct(config.foreign)?,
 			authorities: Authorities {
+				#[cfg(feature = "deploy")]
 				accounts: config.authorities.accounts,
 				required_signatures: config.authorities.required_signatures,
 			},
@@ -207,6 +208,7 @@ pub struct ContractConfig {
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct Authorities {
+	#[cfg(feature = "deploy")]
 	pub accounts: Vec<Address>,
 	pub required_signatures: u32,
 }
@@ -306,8 +308,9 @@ mod load {
 	}
 
 	#[derive(Deserialize)]
-	#[serde(deny_unknown_fields)]
 	pub struct Authorities {
+		#[cfg(feature = "deploy")]
+		#[serde(default)]
 		pub accounts: Vec<Address>,
 		pub required_signatures: u32,
 	}
@@ -352,11 +355,6 @@ password = "password"
 bin = "../compiled_contracts/ForeignBridge.bin"
 
 [authorities]
-accounts = [
-	"0x0000000000000000000000000000000000000001",
-	"0x0000000000000000000000000000000000000002",
-	"0x0000000000000000000000000000000000000003"
-]
 required_signatures = 2
 
 [transactions]
@@ -405,10 +403,8 @@ home_deploy = { gas = 20 }
 				concurrent_http_requests: DEFAULT_CONCURRENCY,
 			},
 			authorities: Authorities {
+				#[cfg(feature = "deploy")]
 				accounts: vec![
-					"0000000000000000000000000000000000000001".into(),
-					"0000000000000000000000000000000000000002".into(),
-					"0000000000000000000000000000000000000003".into(),
 				],
 				required_signatures: 2,
 			},
@@ -451,11 +447,6 @@ password = "password"
 bin = "../compiled_contracts/ForeignBridge.bin"
 
 [authorities]
-accounts = [
-	"0x0000000000000000000000000000000000000001",
-	"0x0000000000000000000000000000000000000002",
-	"0x0000000000000000000000000000000000000003"
-]
 required_signatures = 2
 "#;
 		let expected = Config {
@@ -499,10 +490,8 @@ required_signatures = 2
 				concurrent_http_requests: DEFAULT_CONCURRENCY,
 			},
 			authorities: Authorities {
+				#[cfg(feature = "deploy")]
 				accounts: vec![
-					"0000000000000000000000000000000000000001".into(),
-					"0000000000000000000000000000000000000002".into(),
-					"0000000000000000000000000000000000000003".into(),
 				],
 				required_signatures: 2,
 			},

examples/config.toml

@@ -18,9 +18,6 @@ rpc_port = 443
 default_gas_price = 5_000_000_000 # 5 GWEI
 
 [authorities]
-accounts = [
-	"0x006e27b6a72e1f34c626762f3c4761547aff1421",
-]
 required_signatures = 1
 
 [transactions]