f rename reset_on_reload to static_value

Author: valentinewallace

lightning/src/util/ser_macros.rs

@@ -11,7 +11,7 @@ macro_rules! encode_tlv {
 	($stream: expr, $type: expr, $field: expr, (default_value, $default: expr)) => {
 		encode_tlv!($stream, $type, $field, required)
 	};
-	($stream: expr, $type: expr, $field: expr, (reset_on_reload, $value: expr)) => {
+	($stream: expr, $type: expr, $field: expr, (static_value, $value: expr)) => {
 		let _ = &$field; // Ensure we "use" the $field
 	};
 	($stream: expr, $type: expr, $field: expr, required) => {
@@ -76,7 +76,7 @@ macro_rules! get_varint_length_prefixed_tlv_length {
 	($len: expr, $type: expr, $field: expr, (default_value, $default: expr)) => {
 		get_varint_length_prefixed_tlv_length!($len, $type, $field, required)
 	};
-	($len: expr, $type: expr, $field: expr, (reset_on_reload, $value: expr)) => {
+	($len: expr, $type: expr, $field: expr, (static_value, $value: expr)) => {
 	};
 	($len: expr, $type: expr, $field: expr, required) => {
 		BigSize($type).write(&mut $len).expect("No in-memory data may fail to serialize");
@@ -121,7 +121,7 @@ macro_rules! check_tlv_order {
 			$field = $default.into();
 		}
 	}};
-	($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, (reset_on_reload, $value: expr)) => {
+	($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, (static_value, $value: expr)) => {
 	};
 	($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, required) => {{
 		#[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
@@ -155,7 +155,7 @@ macro_rules! check_missing_tlv {
 			$field = $default.into();
 		}
 	}};
-	($last_seen_type: expr, $type: expr, $field: expr, (reset_on_reload, $value: expr)) => {
+	($last_seen_type: expr, $type: expr, $field: expr, (static_value, $value: expr)) => {
 		$field = $value;
 	};
 	($last_seen_type: expr, $type: expr, $field: ident, required) => {{
@@ -186,7 +186,7 @@ macro_rules! decode_tlv {
 	($reader: expr, $field: ident, (default_value, $default: expr)) => {{
 		decode_tlv!($reader, $field, required)
 	}};
-	($reader: expr, $field: ident, (reset_on_reload, $value: expr)) => {{
+	($reader: expr, $field: ident, (static_value, $value: expr)) => {{
 	}};
 	($reader: expr, $field: ident, required) => {{
 		$field = $crate::util::ser::Readable::read(&mut $reader)?;
@@ -216,7 +216,7 @@ macro_rules! decode_tlv {
 }
 
 macro_rules! _decode_tlv_stream_match_check {
-	($val: ident, $type: expr, (reset_on_reload, $value: expr)) => { false };
+	($val: ident, $type: expr, (static_value, $value: expr)) => { false };
 	($val: ident, $type: expr, $fieldty: tt) => { $val == $type }
 }
 
@@ -430,7 +430,7 @@ macro_rules! init_tlv_based_struct_field {
 	($field: ident, (default_value, $default: expr)) => {
 		$field.0.unwrap()
 	};
-	($field: ident, (reset_on_reload, $value: expr)) => {
+	($field: ident, (static_value, $value: expr)) => {
 		$field
 	};
 	($field: ident, option) => {
@@ -448,7 +448,7 @@ macro_rules! init_tlv_field_var {
 	($field: ident, (default_value, $default: expr)) => {
 		let mut $field = $crate::util::ser::OptionDeserWrapper(None);
 	};
-	($field: ident, (reset_on_reload, $value: expr)) => {
+	($field: ident, (static_value, $value: expr)) => {
 		let $field;
 	};
 	($field: ident, required) => {