regen schema without treasury for now

I'm not completely sure if we should re-implement this in the explorer too, or if we should implement it in rest only, so for now this changes it to a TODO
input-output-hk · Jun 8, 2021 · 5de823e · 5de823e
1 parent 5ee8e0c
commit 5de823e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 116 deletions.
diff --git a/testing/jormungandr-integration-tests/src/jormungandr/vit/private.rs b/testing/jormungandr-integration-tests/src/jormungandr/vit/private.rs
@@ -118,19 +118,7 @@ pub fn jcli_e2e_flow_private_vote() {
 
     alice.confirm_transaction();
 
-    let rewards_before = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_before: u64 = unimplemented!("treasury query not supported by external explorer");
 
     time::wait_for_epoch(1, jormungandr.rest());
 
@@ -270,19 +258,7 @@ pub fn jcli_e2e_flow_private_vote() {
 
     time::wait_for_epoch(3, jormungandr.rest());
 
-    let rewards_after = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_after: u64 = unimplemented!("treasury query not supported by external explorer");
 
     // We want to make sure that our small rewards increase is reflexed in current rewards amount
     assert!(

diff --git a/testing/jormungandr-integration-tests/src/jormungandr/vit/public.rs b/testing/jormungandr-integration-tests/src/jormungandr/vit/public.rs
@@ -182,19 +182,7 @@ pub fn test_vote_flow_bft() {
         .send_vote_cast(&mut bob, &vote_plan, 0, &favorable_choice, &jormungandr)
         .unwrap();
 
-    let rewards_before = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_before: u64 = unimplemented!("treasury query not supported by external explorer");
 
     wait_for_epoch(1, jormungandr.rest());
 
@@ -214,19 +202,7 @@ pub fn test_vote_flow_bft() {
         jormungandr.rest().vote_plan_statuses().unwrap(),
     );
 
-    let rewards_after = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_after: u64 = unimplemented!("treasury query not supported by external explorer");
 
     assert!(
         rewards_after == (rewards_before + rewards_increase),
@@ -323,19 +299,7 @@ pub fn test_vote_flow_praos() {
 
     wait_for_epoch(3, jormungandr.rest());
 
-    let rewards_after = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_after: u64 = unimplemented!("treasury query not supported by external explorer");
 
     // We want to make sure that our small rewards increase is reflexed in current rewards amount
     assert!(
@@ -423,19 +387,7 @@ pub fn jcli_e2e_flow() {
 
     alice.confirm_transaction();
 
-    let rewards_before = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_before: u64 = unimplemented!("treasury query not supported by external explorer");
 
     time::wait_for_epoch(1, jormungandr.rest());
 
@@ -529,19 +481,7 @@ pub fn jcli_e2e_flow() {
         3
     );
 
-    let rewards_after = jormungandr
-        .explorer()
-        .last_block()
-        .unwrap()
-        .data
-        .unwrap()
-        .tip
-        .block
-        .treasury
-        .unwrap()
-        .rewards
-        .parse::<u64>()
-        .unwrap();
+    let rewards_after: u64 = unimplemented!("treasury query not supported by external explorer");
 
     // We want to make sure that our small rewards increase is reflexed in current rewards amount
     assert!(

diff --git a/testing/jormungandr-testing-utils/resources/explorer/graphql/allblocks.graphql b/testing/jormungandr-testing-utils/resources/explorer/graphql/allblocks.graphql
@@ -16,18 +16,6 @@ query AllBlocks($last: Int!) {
           chainLength
           totalInput
           totalOutput
-          treasury {
-            rewards
-            treasury
-            treasuryTax {
-              fixed
-              ratio {
-                numerator
-                denominator
-              }
-              maxLimit
-            }
-          }
         }
       }
       totalCount

diff --git a/testing/jormungandr-testing-utils/resources/explorer/graphql/lastblock.graphql b/testing/jormungandr-testing-utils/resources/explorer/graphql/lastblock.graphql
@@ -9,10 +9,6 @@ query LastBlock {
         }
         slot
       }
-      treasury {
-        rewards
-        treasury
-      }
     }
   }
 }
diff --git a/testing/jormungandr-testing-utils/resources/explorer/graphql/schema.graphql b/testing/jormungandr-testing-utils/resources/explorer/graphql/schema.graphql
@@ -26,7 +26,6 @@ type Block {
   previousBlock: Block!
   totalInput: Value!
   totalOutput: Value!
-  treasury: Treasury
   isConfirmed: Boolean!
   branches: [Branch!]!
 }
@@ -200,7 +199,7 @@ type Proposal {
 
   """
   get the vote options range
-
+  
   this is the available range of choices to make for the given
   proposal. all casted votes for this proposals ought to be in
   within the given range
@@ -320,12 +319,6 @@ type TransactionOutput {
   address: Address!
 }
 
-type Treasury {
-  rewards: Value!
-  treasury: Value!
-  treasuryTax: TaxType!
-}
-
 scalar Value
 
 type VoteCast {

diff --git a/testing/jormungandr-testing-utils/src/testing/node/explorer/data.rs b/testing/jormungandr-testing-utils/src/testing/node/explorer/data.rs
@@ -3,7 +3,6 @@ pub type Slot = String;
 pub type ChainLength = String;
 pub type PoolId = String;
 pub type Value = String;
-pub type NonZero = String;
 pub type VotePlanId = String;
 
 use graphql_client::GraphQLQuery;