From bf9ae009ee5ef16ba69fb059dd4a87e74a690dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Wed, 13 Apr 2022 10:55:51 +0100 Subject: [PATCH] Exporting intermediate structs, but RewardEstimationResponse fails to calculate import path --- .../mixnet-contract/src/gateway.rs | 4 ++-- .../mixnet-contract/src/mixnode.rs | 8 +++---- .../mixnet-contract/src/reward_params.rs | 21 +++++++++++++++++++ .../src/types/rust/epochrewardparams.ts | 2 ++ nym-wallet/src/types/rust/gateway.ts | 11 ++-------- nym-wallet/src/types/rust/mixnode.ts | 12 ++--------- nym-wallet/src/types/rust/noderewardparams.ts | 2 ++ .../src/types/rust/rewardedsetnodestatus.ts | 3 ++- nym-wallet/src/types/rust/rewardparams.ts | 4 ++++ 9 files changed, 41 insertions(+), 26 deletions(-) create mode 100644 nym-wallet/src/types/rust/epochrewardparams.ts create mode 100644 nym-wallet/src/types/rust/noderewardparams.ts create mode 100644 nym-wallet/src/types/rust/rewardparams.ts diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs index 22800f23dd..abbc00476a 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs @@ -8,9 +8,9 @@ use serde::{Deserialize, Serialize}; use std::cmp::Ordering; use std::fmt::Display; -#[cfg_attr(test, derive(ts_rs::TS))] +#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] #[cfg_attr( - test, + all(feature = "ts-rs", test), ts(export, export_to = "../../../nym-wallet/src/types/rust/gateway.ts") )] #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)] diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs index a55a5a3392..2dfafab269 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs @@ -14,9 +14,9 @@ use serde_repr::{Deserialize_repr, Serialize_repr}; use std::cmp::Ordering; use std::fmt::Display; -#[cfg_attr(test, derive(ts_rs::TS))] +#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] #[cfg_attr( - test, + all(feature = "ts-rs", test), ts( export, export_to = "../../../nym-wallet/src/types/rust/rewardedsetnodestatus.ts" @@ -109,9 +109,9 @@ impl PendingUndelegate { } } -#[cfg_attr(test, derive(ts_rs::TS))] +#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] #[cfg_attr( - test, + all(feature = "ts-rs", test), ts(export, export_to = "../../../nym-wallet/src/types/rust/mixnode.ts") )] #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)] diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/reward_params.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/reward_params.rs index 07627e524f..9b83854c1f 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/reward_params.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/reward_params.rs @@ -97,6 +97,13 @@ impl NodeEpochRewards { #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)] #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] +#[cfg_attr( + all(feature = "ts-rs", test), + ts( + export, + export_to = "../../../nym-wallet/src/types/rust/epochrewardparams.ts" + ) +)] pub struct EpochRewardParams { #[cfg_attr(feature = "ts-rs", ts(type = "string"))] epoch_reward_pool: Uint128, @@ -166,6 +173,13 @@ impl EpochRewardParams { #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)] #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] +#[cfg_attr( + all(feature = "ts-rs", test), + ts( + export, + export_to = "../../../nym-wallet/src/types/rust/noderewardparams.ts" + ) +)] pub struct NodeRewardParams { reward_blockstamp: u64, #[cfg_attr(feature = "ts-rs", ts(type = "string"))] @@ -197,6 +211,13 @@ impl NodeRewardParams { #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)] #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] +#[cfg_attr( + all(feature = "ts-rs", test), + ts( + export, + export_to = "../../../nym-wallet/src/types/rust/rewardparams.ts" + ) +)] pub struct RewardParams { pub epoch: EpochRewardParams, pub node: NodeRewardParams, diff --git a/nym-wallet/src/types/rust/epochrewardparams.ts b/nym-wallet/src/types/rust/epochrewardparams.ts new file mode 100644 index 0000000000..d88d78f2ad --- /dev/null +++ b/nym-wallet/src/types/rust/epochrewardparams.ts @@ -0,0 +1,2 @@ + +export interface EpochRewardParams { epoch_reward_pool: string, rewarded_set_size: string, active_set_size: string, circulating_supply: string, sybil_resistance_percent: number, active_set_work_factor: number, } \ No newline at end of file diff --git a/nym-wallet/src/types/rust/gateway.ts b/nym-wallet/src/types/rust/gateway.ts index 1dbba0e5ed..24b3b7eb58 100644 --- a/nym-wallet/src/types/rust/gateway.ts +++ b/nym-wallet/src/types/rust/gateway.ts @@ -1,9 +1,2 @@ -export interface Gateway { - host: string; - mix_port: number; - clients_port: number; - location: string; - sphinx_key: string; - identity_key: string; - version: string; -} + +export interface Gateway { host: string, mix_port: number, clients_port: number, location: string, sphinx_key: string, identity_key: string, version: string, } \ No newline at end of file diff --git a/nym-wallet/src/types/rust/mixnode.ts b/nym-wallet/src/types/rust/mixnode.ts index d1c3a9574b..6b6d783dda 100644 --- a/nym-wallet/src/types/rust/mixnode.ts +++ b/nym-wallet/src/types/rust/mixnode.ts @@ -1,10 +1,2 @@ -export interface MixNode { - host: string; - mix_port: number; - verloc_port: number; - http_api_port: number; - sphinx_key: string; - identity_key: string; - version: string; - profit_margin_percent: number; -} + +export interface MixNode { host: string, mix_port: number, verloc_port: number, http_api_port: number, sphinx_key: string, identity_key: string, version: string, profit_margin_percent: number, } \ No newline at end of file diff --git a/nym-wallet/src/types/rust/noderewardparams.ts b/nym-wallet/src/types/rust/noderewardparams.ts new file mode 100644 index 0000000000..21695d351e --- /dev/null +++ b/nym-wallet/src/types/rust/noderewardparams.ts @@ -0,0 +1,2 @@ + +export interface NodeRewardParams { reward_blockstamp: bigint, uptime: string, in_active_set: boolean, } \ No newline at end of file diff --git a/nym-wallet/src/types/rust/rewardedsetnodestatus.ts b/nym-wallet/src/types/rust/rewardedsetnodestatus.ts index 8ddd13d047..3f0bb8e3e6 100644 --- a/nym-wallet/src/types/rust/rewardedsetnodestatus.ts +++ b/nym-wallet/src/types/rust/rewardedsetnodestatus.ts @@ -1 +1,2 @@ -export type RewardedSetNodeStatus = 'Active' | 'Standby'; + +export type RewardedSetNodeStatus = "Active" | "Standby"; \ No newline at end of file diff --git a/nym-wallet/src/types/rust/rewardparams.ts b/nym-wallet/src/types/rust/rewardparams.ts new file mode 100644 index 0000000000..0e9e5bb4f8 --- /dev/null +++ b/nym-wallet/src/types/rust/rewardparams.ts @@ -0,0 +1,4 @@ +import type { EpochRewardParams } from "./epochrewardparams"; +import type { NodeRewardParams } from "./noderewardparams"; + +export interface RewardParams { epoch: EpochRewardParams, node: NodeRewardParams, } \ No newline at end of file