Merge #275: Rename script_pub_key to script_pubkey

303d8e4 Rename script_pub_key to script_pubkey (GideonBature)

Pull request description:

  This is a follow up PR, that implements the suggestion given in this [comment](#263 (comment)) for PR #263 to rename `script_pub_key` to `script_pubkey` for readability purpose.

ACKs for top commit:
  tcharding:
    ACK 303d8e4

Tree-SHA512: b6f5f0def9947f8dcfbe2464ffdff295a084dfe634d5e081276ca79b84c31a7569a45db5ba6c8386372ab35ae33cf6154439832fa809b31ee0ba4d7c1aad2568

Author: tcharding

client/src/client_sync/v17/mod.rs

@@ -258,7 +258,7 @@ pub struct ImportMultiRequest {
     pub desc: Option<String>, // from core v18 onwards.
     /// Type of scriptPubKey (string for script, json for address). Should not be provided if using descriptor.
     #[serde(rename = "scriptPubKey", skip_serializing_if = "Option::is_none")]
-    pub script_pub_key: Option<ImportMultiScriptPubKey>,
+    pub script_pubkey: Option<ImportMultiScriptPubKey>,
     /// Creation time of the key expressed in UNIX epoch time, or the string "now" to substitute the current synced blockchain time.
     pub timestamp: ImportMultiTimestamp,
 }

integration_test/tests/wallet.rs

@@ -387,14 +387,14 @@ fn wallet__import_multi() {
     // to ensure import succeeds, since the wallet already knows the key.
     let req1 = ImportMultiRequest {
         desc: None,
-        script_pub_key: Some(ImportMultiScriptPubKey::Script(dummy_script_hex.to_string())),
+        script_pubkey: Some(ImportMultiScriptPubKey::Script(dummy_script_hex.to_string())),
         timestamp: ImportMultiTimestamp::Now,
     };
 
     // Uses an address (valid): success - false, with JSON-RPC error.
     let req2 = ImportMultiRequest {
         desc: None,
-        script_pub_key: Some(ImportMultiScriptPubKey::Address {
+        script_pubkey: Some(ImportMultiScriptPubKey::Address {
             address: addr.to_string(),
         }),
         timestamp: ImportMultiTimestamp::Now,
@@ -405,7 +405,7 @@ fn wallet__import_multi() {
     // NOTE: Works only for v18 onwards, as v17 doesn't support descriptors.
     let req3 = ImportMultiRequest {
         desc: Some(dummy_desc.to_string()),
-        script_pub_key: None,
+        script_pubkey: None,
         timestamp: ImportMultiTimestamp::Time(1_700_000_000),
     };
 

types/src/v17/util/error.rs

@@ -43,7 +43,7 @@ impl std::error::Error for CreateMultisigError {
 pub enum ValidateAddressError {
     /// Conversion of the `address` field failed.
     Address(address::ParseError),
-    /// Conversion of the `script_pub_key` field failed.
+    /// Conversion of the `script_pubkey` field failed.
     ScriptPubkey(hex::HexToBytesError),
     /// The `witness_version` field's value was too big for a u8.
     WitnessVersionValue(i64),
@@ -62,7 +62,7 @@ impl fmt::Display for ValidateAddressError {
         match *self {
             E::Address(ref e) => write!(f, "conversion of the `address` field failed: {}", e),
             E::ScriptPubkey(ref e) =>
-                write!(f, "conversion of the `script_pub_key` field failed: {}", e),
+                write!(f, "conversion of the `script_pubkey` field failed: {}", e),
             E::WitnessVersionValue(v) => write!(f, "invalid witness version number: {}", v),
             E::WitnessVersion(ref e) =>
                 write!(f, "conversion of the `witness_version` field failed: {}", e),