update

Author: Mr-Leshiy

src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs

@@ -294,7 +294,6 @@ mod tests {
     }
 
     #[test]
-    #[should_panic]
     pub fn spending_counter_increasing_wrong_lane() {
         let mut sc_increasing = SpendingCounterIncreasing::default();
         let incorrect_sc = SpendingCounter::new(SpendingCounterIncreasing::LANES, 1).unwrap();

src/chain-wallet-libs/bindings/wallet-core/src/tx_builder.rs

@@ -13,7 +13,7 @@ pub struct TxBuilder<P: Payload> {
     builder: wallet::TransactionBuilder<P>,
 }
 
-impl<'settings, P: Payload> TxBuilder<P> {
+impl<P: Payload> TxBuilder<P> {
     pub fn new(settings: Settings, valid_until: BlockDate, payload: P) -> Self {
         let builder = wallet::TransactionBuilder::new(settings, payload, valid_until);
         Self { builder }

src/chain-wallet-libs/bindings/wallet-wasm-js/js-test/test/vote_cast.js

@@ -19,10 +19,9 @@ describe("vote cast certificate tests", function () {
         "hex"
       ),
       2,
-      true,
       8
     );
-    let vote = proposal.vote(1, 1, new wallet.BlockDate(0, 1), 0);
+    let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
     let fragments = wallet.signVotes([vote], settings, private_key);
     assert(fragments.length == 1);
   });
@@ -37,14 +36,13 @@ describe("vote cast certificate tests", function () {
         "hex"
       ),
       4,
-      true,
       8,
       Buffer.from(
         "bed88887abe0a84f64691fe0bdfa3daf1a6cd697a13f07ae07588910ce39c927",
         "hex"
       )
     );
-    let vote = proposal.vote(1, 1, new wallet.BlockDate(0, 1), 0);
+    let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
     let fragments = wallet.signVotes([vote], settings, private_key);
     assert(fragments.length == 1);
   });

src/chain-wallet-libs/bindings/wallet-wasm-js/js/index.d.ts

@@ -35,6 +35,9 @@ export class Settings {
  */
 export class Vote {
   voteCast: wallet_wasm.VoteCast;
+  spendingCounter: number;
+  spendingCounterLane: number;
+  validUntil: BlockDate;
 
   /**
    * Constructs public wallet-wasm-js VoteCast vote

src/chain-wallet-libs/bindings/wallet-wasm-js/js/index.js

@@ -21,98 +21,68 @@ module.exports.Settings = Settings;
 
 class Vote {
   constructor(
-    spendingCounter,
-    spendingCounterLane,
-    validUntil,
-    votePlan,
-    proposalIndex,
+    proposal,
     choice,
-    options,
-    publicKey
+    expiration,
+    spendingCounter,
+    spendingCounterLane
   ) {
+    this.proposal = proposal;
+    this.choice = choice;
+    this.expiration = expiration;
     this.spendingCounter = spendingCounter;
     this.spendingCounterLane = spendingCounterLane;
-    this.validUntil = validUntil;
-    if (options != undefined && publicKey != undefined) {
-      let payload = wasm.Payload.new_private(
-        wasm.VotePlanId.from_bytes(votePlan),
-        options,
-        choice,
-        publicKey
-      );
-      this.voteCast = wasm.VoteCast.new(
-        wasm.VotePlanId.from_bytes(votePlan),
-        proposalIndex,
-        payload
-      );
-    } else {
-      let payload = wasm.Payload.new_public(choice);
-      this.voteCast = wasm.VoteCast.new(
-        wasm.VotePlanId.from_bytes(votePlan),
-        proposalIndex,
-        payload
-      );
-    }
   }
 }
 module.exports.Vote = Vote;
 
 class Proposal {
-  constructor(
-    votePlan,
-    voteOptions,
-    votePublic,
-    proposalIndex,
-    committee_public_key
-  ) {
+  constructor(votePlan, voteOptions, proposalIndex, voteEncKey) {
     this.votePlan = votePlan;
     this.voteOptions = voteOptions;
-    this.votePublic = votePublic;
     this.proposalIndex = proposalIndex;
-    this.committee_public_key = committee_public_key;
-  }
-
-  vote(spendingCounter, spendingCounterLane, validUntil, choice) {
-    if (this.votePublic) {
-      return new Vote(
-        spendingCounter,
-        spendingCounterLane,
-        validUntil,
-        this.votePlan,
-        this.proposalIndex,
-        choice
-      );
-    } else {
-      return new Vote(
-        spendingCounter,
-        spendingCounterLane,
-        validUntil,
-        this.votePlan,
-        this.proposalIndex,
-        choice,
-        this.voteOptions,
-        this.committee_public_key
-      );
-    }
+    this.voteEncKey = voteEncKey;
   }
 }
 module.exports.Proposal = Proposal;
 
 function signVotes(votes, settings, privateKey) {
   let fragments = [];
   for (let i = 0; i < votes.length; i++) {
+    let vote = votes[i];
+    let voteCast;
+    if (
+      vote.proposal.options != undefined &&
+      vote.proposal.voteEncKey != undefined
+    ) {
+      let payload = wasm.Payload.new_private(
+        wasm.VotePlanId.from_bytes(vote.proposal.votePlan),
+        vote.proposal.options,
+        vote.choice,
+        vote.proposal.voteEncKey
+      );
+      voteCast = wasm.VoteCast.new(
+        wasm.VotePlanId.from_bytes(vote.proposal.votePlan),
+        vote.proposal.proposalIndex,
+        payload
+      );
+    } else {
+      let payload = wasm.Payload.new_public(vote.choice);
+      voteCast = wasm.VoteCast.new(
+        wasm.VotePlanId.from_bytes(vote.proposal.votePlan),
+        vote.proposal.proposalIndex,
+        payload
+      );
+    }
+
     let builder = wasm.VoteCastTxBuilder.new(
       settings.settings,
-      votes[i].validUntil.epoch,
-      votes[i].validUntil.slot,
-      votes[i].voteCast
+      vote.expiration.epoch,
+      vote.expiration.slot,
+      voteCast
     );
     let fragment = builder
-      .build_tx(
-        privateKey,
-        votes[i].spendingCounter,
-        votes[i].spendingCounterLane
-      )
+      .build_tx(privateKey, vote.spendingCounter, vote.spendingCounterLane)
       .finalize_tx();
     fragments.push(fragment);
   }

src/chain-wallet-libs/bindings/wallet-wasm-js/src/lib.rs

@@ -80,7 +80,7 @@ impl VoteCastTxBuilder {
     /// Finish step of building VoteCast fragment
     pub fn finalize_tx(self) -> Result<Fragment, JsValue> {
         self.0
-            .finalize_tx((), |tx| FragmentLib::VoteCast(tx))
+            .finalize_tx((), FragmentLib::VoteCast)
             .map_err(|e| JsValue::from(e.to_string()))
             .map(Fragment)
     }