renamed timestamp to block_time

Author: reuvenpo

src/contract.rs

@@ -3772,7 +3772,7 @@ mod tests {
                     amount: Uint128(2500),
                 },
                 memo: Some("my transfer message #3".to_string()),
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3787,7 +3787,7 @@ mod tests {
                     amount: Uint128(500),
                 },
                 memo: Some("my transfer message #2".to_string()),
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3802,7 +3802,7 @@ mod tests {
                     amount: Uint128(1000),
                 },
                 memo: Some("my transfer message #1".to_string()),
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3813,7 +3813,7 @@ mod tests {
                     amount: Uint128(1000),
                 },
                 memo: None,
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3827,7 +3827,7 @@ mod tests {
                     amount: Uint128(100),
                 },
                 memo: Some("my mint message".to_string()),
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3838,7 +3838,7 @@ mod tests {
                     amount: Uint128(1000),
                 },
                 memo: None,
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3852,7 +3852,7 @@ mod tests {
                     amount: Uint128(1),
                 },
                 memo: Some("my burn message".to_string()),
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
             RichTx {
@@ -3867,7 +3867,7 @@ mod tests {
                 },
 
                 memo: Some("Initial Balance".to_string()),
-                timestamp: 1571797419,
+                block_time: 1571797419,
                 block_height: 12345,
             },
         ];

src/transaction_history.rs

@@ -26,9 +26,9 @@ pub struct Tx {
     pub coins: Coin,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub memo: Option<String>,
-    // The timestamp and block height are optional so that the JSON schema
+    // The block time and block height are optional so that the JSON schema
     // reflects that some SNIP-20 contracts may not include this info.
-    pub timestamp: Option<u64>,
+    pub block_time: Option<u64>,
     pub block_height: Option<u64>,
 }
 
@@ -64,7 +64,7 @@ pub struct RichTx {
     pub coins: Coin,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub memo: Option<String>,
-    pub timestamp: u64,
+    pub block_time: u64,
     pub block_height: u64,
 }
 
@@ -80,7 +80,7 @@ struct StoredLegacyTransfer {
     receiver: CanonicalAddr,
     coins: Coin,
     memo: Option<String>,
-    timestamp: u64,
+    block_time: u64,
     block_height: u64,
 }
 
@@ -93,7 +93,7 @@ impl StoredLegacyTransfer {
             receiver: api.human_address(&self.receiver)?,
             coins: self.coins,
             memo: self.memo,
-            timestamp: Some(self.timestamp),
+            block_time: Some(self.block_time),
             block_height: Some(self.block_height),
         };
         Ok(tx)
@@ -239,7 +239,7 @@ struct StoredRichTx {
     action: StoredTxAction,
     coins: Coin,
     memo: Option<String>,
-    timestamp: u64,
+    block_time: u64,
     block_height: u64,
 }
 
@@ -256,7 +256,7 @@ impl StoredRichTx {
             action,
             coins,
             memo,
-            timestamp: block.time,
+            block_time: block.time,
             block_height: block.height,
         }
     }
@@ -267,7 +267,7 @@ impl StoredRichTx {
             action: self.action.into_humanized(api)?,
             coins: self.coins,
             memo: self.memo,
-            timestamp: self.timestamp,
+            block_time: self.block_time,
             block_height: self.block_height,
         })
     }
@@ -279,7 +279,7 @@ impl StoredRichTx {
             action,
             coins: transfer.coins,
             memo: transfer.memo,
-            timestamp: transfer.timestamp,
+            block_time: transfer.block_time,
             block_height: transfer.block_height,
         }
     }
@@ -314,7 +314,7 @@ pub fn store_transfer<S: Storage>(
         receiver: receiver.clone(),
         coins,
         memo,
-        timestamp: block.time,
+        block_time: block.time,
         block_height: block.height,
     };
     let tx = StoredRichTx::from_stored_legacy_transfer(transfer.clone());

tests/integration.sh

@@ -563,7 +563,7 @@ function check_latest_tx_history() {
     local from="$5"
     local receiver="$6"
     local amount="$7"
-    local timestamp="$8"
+    local block_time="$8"
     local block_height="$9"
 
     local txs
@@ -577,7 +577,7 @@ function check_latest_tx_history() {
     assert_eq "$(jq -r '.receiver' <<<"$tx")" "$receiver"
     assert_eq "$(jq -r '.coins.amount' <<<"$tx")" "$amount"
     assert_eq "$(jq -r '.coins.denom' <<<"$tx")" 'SSCRT'
-    assert_eq "$(jq -r '.timestamp' <<<"$tx")" "$timestamp"
+    assert_eq "$(jq -r '.block_time' <<<"$tx")" "$block_time"
     assert_eq "$(jq -r '.block_height' <<<"$tx")" "$block_height"
 
     jq -r '.id' <<<"$tx"
@@ -1121,11 +1121,11 @@ function main() {
 
     # This first test also sets the `VK[*]` global variables that are used in the other tests
     test_viewing_key "$contract_addr"
-#    test_deposit "$contract_addr"
-#    test_transfer "$contract_addr"
+    test_deposit "$contract_addr"
+    test_transfer "$contract_addr"
     test_send "$contract_addr"
-#    test_burn "$contract_addr"
-#    test_transfer_from "$contract_addr"
+    test_burn "$contract_addr"
+    test_transfer_from "$contract_addr"
     test_send_from "$contract_addr"
 
     log 'Tests completed successfully'