X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fln%2Fchannel.rs;fp=src%2Fln%2Fchannel.rs;h=7cc0dea5ff7e75875d901218b44fc223e9d3dd81;hb=e93c9fbeaf6312fb77bce1ad96a2abb44124f136;hp=d4d264b0ad25a21823e7c3b5fb46499cd2ad244a;hpb=456323886b9f5b67af3b07d9b3094cdc6d29d1cb;p=rust-lightning

diff --git a/src/ln/channel.rs b/src/ln/channel.rs
index d4d264b0..7cc0dea5 100644
--- a/src/ln/channel.rs
+++ b/src/ln/channel.rs
@@ -2,7 +2,6 @@ use bitcoin::blockdata::block::BlockHeader;
 use bitcoin::blockdata::script::{Script,Builder};
 use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
 use bitcoin::blockdata::opcodes;
-use bitcoin::util::uint::Uint256;
 use bitcoin::util::hash::{Sha256dHash, Hash160};
 use bitcoin::util::bip143;
 use bitcoin::network::serialize::BitcoinHash;
@@ -236,7 +235,7 @@ const BOTH_SIDES_SHUTDOWN_MASK: u32 = (ChannelState::LocalShutdownSent as u32 |
 pub struct Channel {
 	user_id: u64,
 
-	channel_id: Uint256,
+	channel_id: [u8; 32],
 	channel_state: u32,
 	channel_outbound: bool,
 	secp_ctx: Secp256k1,
@@ -380,7 +379,7 @@ impl Channel {
 		Channel {
 			user_id: user_id,
 
-			channel_id: rng::rand_uint256(),
+			channel_id: rng::rand_u832(),
 			channel_state: ChannelState::OurInitSent as u32,
 			channel_outbound: true,
 			secp_ctx: secp_ctx,
@@ -1798,7 +1797,7 @@ impl Channel {
 
 	// Public utilities:
 
-	pub fn channel_id(&self) -> Uint256 {
+	pub fn channel_id(&self) -> [u8; 32] {
 		self.channel_id
 	}