Guillermo Bescos 1 年之前
父节点
当前提交
df589a48e2

+ 3 - 9
target_chains/near/receiver/src/governance.rs

@@ -15,7 +15,8 @@ use {
         },
         Pyth,
         PythExt,
-    }, near_sdk::{
+    },
+    near_sdk::{
         borsh::{
             self,
             BorshDeserialize,
@@ -32,15 +33,8 @@ use {
         Gas,
         Promise,
         PromiseOrValue,
-<<<<<<< HEAD
     },
-    num_traits::FromPrimitive,
-    serde_wormhole::RawMessage,
-    strum::EnumDiscriminants,
-    wormhole_sdk::Chain as WormholeChain,
-=======
-    }, num_traits::FromPrimitive, serde_wormhole::RawMessage, strum::EnumDiscriminants, wormhole_sdk::Chain as WormholeChain
->>>>>>> 574ed178 (Near)
+    num_traits::FromPrimitive, serde_wormhole::RawMessage, strum::EnumDiscriminants, wormhole_sdk::Chain as WormholeChain
 };
 
 /// Magic Header for identifying Governance VAAs.

+ 10 - 5
target_chains/near/receiver/src/lib.rs

@@ -1,7 +1,9 @@
 //#![deny(warnings)]
 
 use {
-    error::Error, ext::ext_wormhole, near_sdk::{
+    error::Error,
+    ext::ext_wormhole,
+    near_sdk::{
         borsh::{
             self,
             BorshDeserialize,
@@ -24,10 +26,12 @@ use {
         PanicOnDefault,
         Promise,
         StorageUsage,
-    }, pyth_wormhole_attester_sdk::{
+    },
+    pyth_wormhole_attester_sdk::{
         BatchPriceAttestation,
         P2W_MAGIC,
-    }, pythnet_sdk::{
+    },
+    pythnet_sdk::{
         accumulators::merkle::MerkleRoot,
         hashers::keccak256_160::Keccak160,
         messages::Message,
@@ -49,10 +53,11 @@ use {
         PriceIdentifier,
         Source,
         Vaa,
-    }, std::io::{
+    },
+    std::io::{
         Cursor,
         Read,
-    }
+    },
 };
 
 pub mod error;

+ 6 - 3
target_chains/near/receiver/tests/workspaces.rs

@@ -24,10 +24,13 @@ use {
         accumulators::{
             merkle::MerkleTree,
             Accumulator,
-        }, hashers::keccak256_160::Keccak160, messages::{
+        },
+        hashers::keccak256_160::Keccak160,
+        messages::{
             Message,
             PriceFeedMessage,
-        }, wire::{
+        },
+        wire::{
             to_vec,
             v1::{
                 AccumulatorUpdateData,
@@ -38,7 +41,7 @@ use {
                 WormholePayload,
             },
             PrefixedVec,
-        }
+        },
     },
     serde_json::json,
     std::io::{