Browse Source
Pass order_id instead of msg to handle func
upload-correct-windows-binary
Daniel Karzel
3 years ago
No known key found for this signature in database
GPG Key ID: 30C3FC2E438ADB6E
2 changed files with
6 additions and
6 deletions
-
daemon/src/maker_cfd.rs
-
daemon/src/taker_cfd.rs
|
|
@ -428,9 +428,9 @@ impl Actor { |
|
|
|
Ok(()) |
|
|
|
} |
|
|
|
|
|
|
|
async fn handle_commit(&mut self, msg: Commit) -> Result<()> { |
|
|
|
async fn handle_commit(&mut self, order_id: OrderId) -> Result<()> { |
|
|
|
let mut conn = self.db.acquire().await?; |
|
|
|
let cfd = load_cfd_by_order_id(msg.order_id, &mut conn).await?; |
|
|
|
let cfd = load_cfd_by_order_id(order_id, &mut conn).await?; |
|
|
|
|
|
|
|
let signed_commit_tx = cfd.commit_tx()?; |
|
|
|
|
|
|
@ -512,7 +512,7 @@ impl Handler<RejectOrder> for Actor { |
|
|
|
#[async_trait] |
|
|
|
impl Handler<Commit> for Actor { |
|
|
|
async fn handle(&mut self, msg: Commit, _ctx: &mut Context<Self>) { |
|
|
|
log_error!(self.handle_commit(msg)) |
|
|
|
log_error!(self.handle_commit(msg.order_id)) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -354,9 +354,9 @@ impl Actor { |
|
|
|
} |
|
|
|
|
|
|
|
// TODO: Duplicated with maker
|
|
|
|
async fn handle_commit(&mut self, msg: Commit) -> Result<()> { |
|
|
|
async fn handle_commit(&mut self, order_id: OrderId) -> Result<()> { |
|
|
|
let mut conn = self.db.acquire().await?; |
|
|
|
let cfd = load_cfd_by_order_id(msg.order_id, &mut conn).await?; |
|
|
|
let cfd = load_cfd_by_order_id(order_id, &mut conn).await?; |
|
|
|
|
|
|
|
let signed_commit_tx = cfd.commit_tx()?; |
|
|
|
|
|
|
@ -475,7 +475,7 @@ impl Handler<oracle::Attestation> for Actor { |
|
|
|
#[async_trait] |
|
|
|
impl Handler<Commit> for Actor { |
|
|
|
async fn handle(&mut self, msg: Commit, _ctx: &mut Context<Self>) { |
|
|
|
log_error!(self.handle_commit(msg)) |
|
|
|
log_error!(self.handle_commit(msg.order_id)) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|