merge fixes

ojo-network · Aug 1, 2023 · 17491e9 · 17491e9
1 parent 25535f9
commit 17491e9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/cosmwasm/contracts/price-feed/src/contract.rs b/cosmwasm/contracts/price-feed/src/contract.rs
@@ -1252,14 +1252,11 @@ mod tests {
     }
 
     mod query {
+        use crate::msg::QueryMsg::{GetRef, GetReferenceData, GetReferenceDataBulk};
+        use cosmwasm_std::from_binary;
         use std::iter::zip;
         use std::ops::Mul;
 
-        use cosmwasm_std::from_binary;
-        use cosmwasm_std::OverflowOperation::Add;
-
-        use crate::msg::QueryMsg::{GetRef, GetReferenceData, GetReferenceDataBulk};
-
         use super::*;
 
         #[test]

diff --git a/cosmwasm/contracts/price-feed/src/msg.rs b/cosmwasm/contracts/price-feed/src/msg.rs
@@ -1,9 +1,7 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::Uint64;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
-use crate::state::{RefData, RefMedianData, ReferenceData,RefDeviationData};
+use crate::state::{RefData, RefDeviationData, RefMedianData, ReferenceData};
 
 #[cw_serde]
 pub struct InstantiateMsg {}

diff --git a/cosmwasm/contracts/price-feed/src/state.rs b/cosmwasm/contracts/price-feed/src/state.rs
@@ -1,6 +1,6 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, StdResult, Storage, Uint256, Uint64};
-use secret_toolkit::serialization::{Bincode2, Json};
+use secret_toolkit::serialization::Bincode2;
 use secret_toolkit::storage::{Item, Keymap, Keyset, KeysetBuilder, WithoutIter};
 use serde::{Deserialize, Serialize};
 

diff --git a/cw-relayer/relayer/relayer.go b/cw-relayer/relayer/relayer.go
@@ -475,9 +475,6 @@ func (r *Relayer) tick(ctx context.Context) error {
 		executeMsgs[i] = &executeMsg
 	}
 
-	logs.Msg("broadcasting execute to contract")
-	if err := r.relayerClient.BroadcastTx(*clientCtx, nextBlockHeight, r.timeoutHeight, executeMsgs...); err != nil {
-
 	if err := r.relayerClient.BroadcastTx(*clientCtx, r.resolveDuration, nextBlockHeight, r.timeoutHeight, executeMsgs...); err != nil {
 		r.missedCounter += 1
 		return err