Merge pull request #194 from input-output-hk/update-chainlibs

update chain-libs
input-output-hk · Oct 12, 2021 · ed63c5e · ed63c5e
2 parents b8c883e + 13f1940
commit ed63c5e
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/wallet-core/src/wallet.rs b/bindings/wallet-core/src/wallet.rs
@@ -131,7 +131,7 @@ impl Wallet {
             Block::read(&mut block0_bytes).map_err(|e| Error::invalid_input("block0").with(e))?;
 
         let settings = wallet::Settings::new(&block0).unwrap();
-        for fragment in block0.contents.iter() {
+        for fragment in block0.contents().iter() {
             self.free_keys.check_fragment(&fragment.hash(), fragment);
             self.account.check_fragment(&fragment.hash(), fragment);
 

diff --git a/wallet/src/blockchain.rs b/wallet/src/blockchain.rs
@@ -23,8 +23,8 @@ pub struct Settings {
 
 impl Settings {
     pub fn new(block: &Block) -> Result<Self, Error> {
-        let header_id = block.header.id();
-        let ledger = Ledger::new(header_id, block.contents.iter())?;
+        let header_id = block.header().id();
+        let ledger = Ledger::new(header_id, block.contents().iter())?;
 
         let static_parameters = ledger.get_static_parameters().clone();
         let parameters = ledger.get_ledger_parameters();
@@ -37,7 +37,7 @@ impl Settings {
         // fixed in Ledger::new (or at least checked).
         let mut slot_duration = None;
 
-        for fragment in block.contents.iter() {
+        for fragment in block.contents().iter() {
             if let Fragment::Initial(initials) = fragment {
                 for initial in initials.iter() {
                     match initial {

diff --git a/wallet/tests/utils/mod.rs b/wallet/tests/utils/mod.rs
@@ -19,15 +19,15 @@ impl State {
     {
         let mut block0_bytes = ReadBuf::from(block0_bytes.as_ref());
         let block0 = Block::read(&mut block0_bytes).expect("valid block0");
-        let hh = block0.header.id();
+        let hh = block0.header().id();
         let ledger = Ledger::new(hh, block0.fragments()).unwrap();
 
         Self { block0, ledger }
     }
 
     #[allow(dead_code)]
     pub fn initial_contents(&self) -> impl Iterator<Item = &'_ Fragment> {
-        self.block0.contents.iter()
+        self.block0.contents().iter()
     }
 
     pub fn settings(&self) -> Result<Settings, LedgerError> {