Merge branch 'master' into evgenii/assets_random_improve

Author: lisicky

rust/src/lib.rs

@@ -258,17 +258,6 @@ impl DataCost {
             }
         }
     }
-
-    // <TODO:REMOVE_AFTER_BABBAGE>
-    pub(crate) fn coins_per_word(&self) -> Result<Coin, JsError> {
-        match &self.0 {
-            DataCostEnum::CoinsPerByte(coins_per_byte) => {
-                coins_per_byte
-                    .checked_mul(&BigNum::from_str("8")?)
-            },
-            DataCostEnum::CoinsPerWord(coins_per_word) => Ok(coins_per_word.clone()),
-        }
-    }
 }
 
 #[wasm_bindgen]

rust/src/tx_builder.rs

@@ -2002,7 +2002,6 @@ mod tests {
         create_tx_builder_with_fee(&create_default_linear_fee())
     }
 
-    #[ignore]
     #[test]
     fn build_tx_with_change() {
         let mut tx_builder = create_default_tx_builder();
@@ -2229,7 +2228,6 @@ mod tests {
         let _final_tx = tx_builder.build(); // just test that it doesn't throw
     }
 
-    #[ignore]
     #[test]
     fn build_tx_exact_amount() {
         // transactions where sum(input) == sum(output) exact should pass
@@ -2294,7 +2292,6 @@ mod tests {
         assert_eq!(final_tx.outputs().len(), 1);
     }
 
-    #[ignore]
     #[test]
     fn build_tx_exact_change() {
         // transactions where we have exactly enough ADA to add change should pass
@@ -2758,7 +2755,6 @@ mod tests {
         assert_eq!(deser_t.to_json().unwrap(), final_tx.to_json().unwrap());
     }
 
-    #[ignore]
     #[test]
     fn build_tx_with_mint_all_sent() {
         let mut tx_builder = create_tx_builder_with_fee(&create_linear_fee(0, 1));
@@ -2847,7 +2843,6 @@ mod tests {
         assert!(change.multiasset().is_none());
     }
 
-    #[ignore]
     #[test]
     fn build_tx_with_mint_in_change() {
         let mut tx_builder = create_tx_builder_with_fee(&create_linear_fee(0, 1));
@@ -3135,7 +3130,6 @@ mod tests {
         assert!(added_change.is_err());
     }
 
-    #[ignore]
     #[test]
     fn build_tx_with_native_assets_change() {
         let mut tx_builder = create_tx_builder_with_fee(&create_linear_fee(0, 1));
@@ -3249,7 +3243,6 @@ mod tests {
         assert_eq!(final_tx.outputs().get(1).amount().coin(), to_bignum(599));
     }
 
-    #[ignore]
     #[test]
     fn build_tx_with_native_assets_change_and_purification() {
         let coin_per_utxo_word = to_bignum(8);
@@ -3378,7 +3371,6 @@ mod tests {
         assert_eq!(final_tx.outputs().get(2).amount().multiasset(), None);
     }
 
-    #[ignore]
     #[test]
     fn build_tx_with_native_assets_change_and_no_purification_cuz_not_enough_pure_coin() {
         // Prefer pure change!
@@ -3795,7 +3787,6 @@ mod tests {
         return (multiasset, policy_ids, names);
     }
 
-    #[ignore]
     #[test]
     fn build_tx_add_change_split_nfts() {
         let max_value_size = 100; // super low max output size to test with fewer assets
@@ -3902,7 +3893,6 @@ mod tests {
             .is_err());
     }
 
-    #[ignore]
     #[test]
     fn build_tx_add_change_nfts_not_enough_ada() {
         let mut tx_builder = create_tx_builder_with_fee_and_val_size(
@@ -4083,7 +4073,6 @@ mod tests {
         assert_eq!(3u8, tx.inputs().get(1).transaction_id().0[0]);
     }
 
-    #[ignore]
     #[test]
     fn tx_builder_cip2_largest_first_multiasset() {
         // we have a = 0 so we know adding inputs/outputs doesn't change the fee so we can analyze more
@@ -4203,7 +4192,6 @@ mod tests {
         assert_eq!(expected_change, change);
     }
 
-    #[ignore]
     #[test]
     fn tx_builder_cip2_random_improve_multiasset() {
         let mut tx_builder = create_tx_builder_with_fee(&create_linear_fee(0, 0));
@@ -4412,7 +4400,6 @@ mod tests {
         assert!(add_inputs_res.is_ok(), "{:?}", add_inputs_res.err());
     }
 
-    #[ignore]
     #[test]
     fn tx_builder_cip2_random_improve_adds_enough_for_fees() {
         // we have a = 1 to test increasing fees when more inputs are added
@@ -4737,7 +4724,6 @@ mod tests {
         );
     }
 
-    #[ignore]
     #[test]
     fn add_change_splits_change_into_multiple_outputs_when_nfts_overflow_output_size() {
         let linear_fee = LinearFee::new(&to_bignum(0), &to_bignum(1));
@@ -5162,7 +5148,6 @@ mod tests {
         assert_eq!(mint_scripts.get(1), mint_script2);
     }
 
-    #[ignore]
     #[test]
     fn add_output_amount() {
         let mut tx_builder = create_default_tx_builder();
@@ -5192,7 +5177,6 @@ mod tests {
         assert_eq!(out.amount, value);
     }
 
-    #[ignore]
     #[test]
     fn add_output_coin() {
         let mut tx_builder = create_default_tx_builder();
@@ -5219,7 +5203,6 @@ mod tests {
         assert!(out.amount.multiasset.is_none());
     }
 
-    #[ignore]
     #[test]
     fn add_output_coin_and_multiasset() {
         let mut tx_builder = create_default_tx_builder();
@@ -5250,7 +5233,6 @@ mod tests {
         assert_eq!(out.amount.multiasset.unwrap(), multiasset);
     }
 
-    #[ignore]
     #[test]
     fn add_output_asset_and_min_required_coin() {
         let mut tx_builder = create_reallistic_tx_builder();
@@ -5284,7 +5266,6 @@ mod tests {
         assert_eq!(out.amount.coin, to_bignum(1146460));
     }
 
-    #[ignore]
     #[test]
     fn add_mint_asset_and_output() {
         let mut tx_builder = create_default_tx_builder();
@@ -5348,7 +5329,6 @@ mod tests {
         assert_eq!(asset.get(&name).unwrap(), to_bignum(1234));
     }
 
-    #[ignore]
     #[test]
     fn add_mint_asset_and_min_required_coin() {
         let mut tx_builder = create_reallistic_tx_builder();
@@ -5555,7 +5535,6 @@ mod tests {
         // assert!(est5.err().unwrap().to_string().contains("witness scripts are not provided"));
     }
 
-    #[ignore]
     #[test]
     fn total_input_output_with_mint_and_burn() {
         let mut tx_builder = create_tx_builder_with_fee(&create_linear_fee(0, 1));
@@ -6674,7 +6653,6 @@ mod tests {
         );
     }
 
-    #[ignore]
     #[test]
     fn test_auto_calc_total_collateral() {
         let mut tx_builder = create_reallistic_tx_builder();
@@ -6710,7 +6688,6 @@ mod tests {
         );
     }
 
-    #[ignore]
     #[test]
     fn test_auto_calc_total_collateral_with_assets() {
         let mut tx_builder = create_reallistic_tx_builder();