Ver código fonte

terra: fix messenger builds for sdk

Change-Id: Id30399c6a0521621c60f8382f13bd29714e6c116
Reisen 3 anos atrás
pai
commit
03aae4a48a

+ 8 - 8
examples/messenger/terra/Cargo.lock

@@ -85,9 +85,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "borsh"
-version = "0.9.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18dda7dc709193c0d86a1a51050a926dc3df1cf262ec46a23a25dba421ea1924"
+checksum = "a5a26c53ddf60281f18e7a29b20db7ba3db82a9d81b9650bfaa02d646f50d364"
 dependencies = [
  "borsh-derive",
  "hashbrown 0.9.1",
@@ -95,9 +95,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "0.9.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264"
+checksum = "307f3740906bac2c118a8122fe22681232b244f1369273e45f1156b45c43d2dd"
 dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
@@ -108,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive-internal"
-version = "0.9.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2102f62f8b6d3edeab871830782285b64cc1830168094db05c8e458f209bc5c3"
+checksum = "d2104c73179359431cc98e016998f2f23bc7a05bc53e79741bcba705f30047bc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -119,9 +119,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-schema-derive-internal"
-version = "0.9.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196c978c4c9b0b142d446ef3240690bf5a8a33497074a113ff9a337ccb750483"
+checksum = "ae29eb8418fcd46f723f8691a2ac06857d31179d33d2f2d91eb13967de97c728"
 dependencies = [
  "proc-macro2",
  "quote",

+ 1 - 4
examples/messenger/terra/src/lib.rs

@@ -12,10 +12,8 @@ use cosmwasm_std::{
     StdResult,
 };
 use wormhole_sdk::{
-    id,
     parse_vaa,
     post_message,
-    VAA,
 };
 
 use messenger_common::Message;
@@ -43,7 +41,6 @@ pub fn execute(deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg) -> S
         ExecuteMsg::SendMessage { nonce, nick, text } => Ok(Response::default()
             .add_attribute("action", "send_message")
             .add_message(post_message(
-                wormhole_sdk::id(),
                 nonce,
                 &Message { nick, text }
                     .try_to_vec()
@@ -54,7 +51,7 @@ pub fn execute(deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg) -> S
         // Terra contract state and can be read out via QueryMsg.
         ExecuteMsg::RecvMessage { vaa } => {
             // Parse VAA and decode Payload into message.
-            let vaa = parse_vaa(wormhole_sdk::id(), deps, env, &vaa)?;
+            let vaa = parse_vaa(deps, env, &vaa)?;
             let msg = Message::try_from_slice(&vaa.payload)
                 .map_err(|_| StdError::generic_err("Invalid Message"))?;
 

+ 0 - 63
sdk/rust/Cargo.lock

@@ -154,12 +154,6 @@ dependencies = [
  "regex-automata",
 ]
 
-[[package]]
-name = "bumpalo"
-version = "3.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
-
 [[package]]
 name = "bv"
 version = "0.11.1"
@@ -1253,62 +1247,6 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
-dependencies = [
- "cfg-if 1.0.0",
- "serde",
- "serde_json",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1351,7 +1289,6 @@ dependencies = [
  "sha3",
  "solana-program",
  "solitaire",
- "wasm-bindgen",
 ]
 
 [[package]]

+ 2 - 2
sdk/rust/sdk/src/chains/terra.rs

@@ -12,11 +12,11 @@ use cosmwasm_std::{
 };
 use serde::Serialize;
 
-use bridge::msg::{
+use wormhole::msg::{
     ExecuteMsg,
     QueryMsg,
 };
-use bridge::state::ParsedVAA;
+use wormhole::state::ParsedVAA;
 
 /// Export Core Mainnet Contract Address
 #[cfg(feature = "mainnet")]