Use ic-btc-interface for ic-doge-interface (temporarily)

Author: ninegua

Cargo.lock

@@ -8,7 +8,6 @@ documentation.workspace = true
 
 [dependencies]
 ic-btc-interface = { workspace = true }
-ic-doge-interface = { git = "ssh://git@github.com/dfinity/dogecoin-canister" }
 ic-btc-replica-types = { path = "../replica_types" }
 ic-config = { path = "../../config" }
 ic-error-types = { path = "../../../packages/ic-error-types" }

rs/bitcoin/consensus/Cargo.toml

@@ -9,12 +9,12 @@ mod proptests;
 
 use crate::metrics::BitcoinPayloadBuilderMetrics;
 use ic_btc_interface::Network as BtcNetwork;
+use ic_btc_interface::Network as DogeNetwork;
 use ic_btc_replica_types::{
     BitcoinAdapterRequestWrapper, BitcoinAdapterResponse, BitcoinAdapterResponseWrapper,
     BitcoinReject, Network,
 };
 use ic_config::bitcoin_payload_builder_config::Config;
-use ic_doge_interface::Network as DogeNetwork;
 use ic_error_types::RejectCode;
 use ic_interfaces::{
     batch_payload::{BatchPayloadBuilder, IntoMessages, PastPayload, ProposalContext},

rs/bitcoin/consensus/src/payload_builder.rs

@@ -9,7 +9,6 @@ documentation.workspace = true
 [dependencies]
 candid = { workspace = true }
 ic-btc-interface = { workspace = true }
-ic-doge-interface = { git = "ssh://git@github.com/dfinity/dogecoin-canister" }
 ic-error-types = { path = "../../../packages/ic-error-types" }
 ic-protobuf = { path = "../../protobuf" }
 serde = { workspace = true }

rs/bitcoin/replica_types/Cargo.toml

@@ -6,7 +6,7 @@
 
 use candid::CandidType;
 use ic_btc_interface::Network as BtcNetwork;
-use ic_doge_interface::Network as DogeNetwork;
+use ic_btc_interface::Network as DogeNetwork;
 use ic_error_types::RejectCode;
 use ic_protobuf::{
     bitcoin::v1,
@@ -24,18 +24,6 @@ pub enum Network {
     Dogecoin(DogeNetwork),
 }
 
-impl From<BtcNetwork> for Network {
-    fn from(network: BtcNetwork) -> Self {
-        Self::Bitcoin(network)
-    }
-}
-
-impl From<DogeNetwork> for Network {
-    fn from(network: DogeNetwork) -> Self {
-        Self::Dogecoin(network)
-    }
-}
-
 impl TryFrom<i32> for Network {
     type Error = ProxyDecodeError;
     fn try_from(network: i32) -> Result<Self, Self::Error> {
@@ -204,17 +192,17 @@ impl BitcoinAdapterRequestWrapper {
         match self {
             BitcoinAdapterRequestWrapper::GetBtcSuccessorsRequest(
                 GetSuccessorsRequestInitial { network, .. },
-            ) => (*network).into(),
+            ) => Network::Bitcoin(*network),
             BitcoinAdapterRequestWrapper::SendBtcTransactionRequest(SendTransactionRequest {
                 network,
                 ..
-            }) => (*network).into(),
+            }) => Network::Bitcoin(*network),
             BitcoinAdapterRequestWrapper::GetDogeSuccessorsRequest(
                 GetDogeSuccessorsRequestInitial { network, .. },
-            ) => (*network).into(),
+            ) => Network::Dogecoin(*network),
             BitcoinAdapterRequestWrapper::SendDogeTransactionRequest(
                 SendDogeTransactionRequest { network, .. },
-            ) => (*network).into(),
+            ) => Network::Dogecoin(*network),
         }
     }
 }