From ca15a7229850d9eebce46479e86fa468d8573695 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@confio.gmbh>
Date: Fri, 25 Feb 2022 14:17:34 +0100
Subject: [PATCH] Fix MemberResponse / use From MemberInfo helper

---
 contracts/tg4-engagement/src/contract.rs | 10 +++-------
 contracts/tg4-mixer/src/contract.rs      |  7 +------
 contracts/tg4-stake/src/contract.rs      | 10 +++-------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/contracts/tg4-engagement/src/contract.rs b/contracts/tg4-engagement/src/contract.rs
index 0c698865..80598689 100644
--- a/contracts/tg4-engagement/src/contract.rs
+++ b/contracts/tg4-engagement/src/contract.rs
@@ -759,15 +759,11 @@ fn query_member<Q: CustomQuery>(
     height: Option<u64>,
 ) -> StdResult<MemberResponse> {
     let addr = deps.api.addr_validate(&addr)?;
-    let points = match height {
+    let mi = match height {
         Some(h) => members().may_load_at_height(deps.storage, &addr, h),
         None => members().may_load(deps.storage, &addr),
-    }?
-    .map(|mi| mi.points);
-    Ok(MemberResponse {
-        points,
-        start_height: None,
-    })
+    }?;
+    Ok(mi.into())
 }
 
 pub fn query_withdrawable_rewards<Q: CustomQuery>(
diff --git a/contracts/tg4-mixer/src/contract.rs b/contracts/tg4-mixer/src/contract.rs
index 402208ac..48936198 100644
--- a/contracts/tg4-mixer/src/contract.rs
+++ b/contracts/tg4-mixer/src/contract.rs
@@ -426,12 +426,7 @@ fn query_member<Q: CustomQuery>(
         Some(h) => members().may_load_at_height(deps.storage, &addr, h),
         None => members().may_load(deps.storage, &addr),
     }?;
-    let points = mi.as_ref().map(|mi| mi.points);
-    let start_height = mi.map(|mi| mi.start_height).unwrap_or(None);
-    Ok(MemberResponse {
-        points,
-        start_height,
-    })
+    Ok(mi.into())
 }
 
 // settings for pagination
diff --git a/contracts/tg4-stake/src/contract.rs b/contracts/tg4-stake/src/contract.rs
index 6115ba0c..0ff8748d 100644
--- a/contracts/tg4-stake/src/contract.rs
+++ b/contracts/tg4-stake/src/contract.rs
@@ -522,15 +522,11 @@ fn query_member<Q: CustomQuery>(
     height: Option<u64>,
 ) -> StdResult<MemberResponse> {
     let addr = deps.api.addr_validate(&addr)?;
-    let points = match height {
+    let mi = match height {
         Some(h) => members().may_load_at_height(deps.storage, &addr, h),
         None => members().may_load(deps.storage, &addr),
-    }?
-    .map(|mi| mi.points);
-    Ok(MemberResponse {
-        points,
-        start_height: None,
-    })
+    }?;
+    Ok(mi.into())
 }
 
 // settings for pagination