From a0ef43b3c53004173291d1fdc44c86c264d35c26 Mon Sep 17 00:00:00 2001 From: MMGen Date: Mon, 3 Jun 2019 12:29:51 +0000 Subject: [PATCH] SubSeed: generate() -> _generate() --- mmgen/seed.py | 8 ++++---- test/unit_tests_d/ut_subseed.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mmgen/seed.py b/mmgen/seed.py index 74f4b81a..2be244f6 100755 --- a/mmgen/seed.py +++ b/mmgen/seed.py @@ -91,7 +91,7 @@ class SubSeedList(MMGenObject): )) if ss_idx.idx > len(self): - self.generate(ss_idx.idx) + self._generate(ss_idx.idx) sid,idx,nonce = self.get_params_by_ss_idx(ss_idx) @@ -128,14 +128,14 @@ class SubSeedList(MMGenObject): if len(self) >= last_idx: return None - self.generate(last_idx,last_sid=sid) + self._generate(last_idx,last_sid=sid) subseed = self.get_existing_subseed_by_seed_id(sid) if subseed: do_msg(subseed) return subseed - def generate(self,last_idx=None,last_sid=None): + def _generate(self,last_idx=None,last_sid=None): if last_idx == None: last_idx = g.subseeds @@ -175,7 +175,7 @@ class SubSeedList(MMGenObject): r = SubSeedIdxRange(first_idx,last_idx) if len(self) < last_idx: - self.generate(last_idx) + self._generate(last_idx) fs1 = '{:>18} {:>18}\n' fs2 = '{i:>7}L: {:8} {i:>7}S: {:8}\n' diff --git a/test/unit_tests_d/ut_subseed.py b/test/unit_tests_d/ut_subseed.py index 8a3867c1..07776df3 100755 --- a/test/unit_tests_d/ut_subseed.py +++ b/test/unit_tests_d/ut_subseed.py @@ -38,19 +38,19 @@ class subseed(object): seed2 = Seed(seed_bin) ss2_list = seed2.subseeds - seed2.subseeds.generate(1) + seed2.subseeds._generate(1) assert len(ss2_list) == 1, len(ss2_list) - seed2.subseeds.generate(1) # do nothing - seed2.subseeds.generate(2) # append one item + seed2.subseeds._generate(1) # do nothing + seed2.subseeds._generate(2) # append one item - seed2.subseeds.generate(5) + seed2.subseeds._generate(5) assert len(ss2_list) == 5, len(ss2_list) - seed2.subseeds.generate(3) # do nothing + seed2.subseeds._generate(3) # do nothing assert len(ss2_list) == 5, len(ss2_list) - seed2.subseeds.generate(10) + seed2.subseeds._generate(10) assert len(ss2_list) == 10, len(ss2_list) assert seed.pformat() == seed2.pformat() @@ -92,7 +92,7 @@ class subseed(object): seed_bin = bytes.fromhex('deadbeef' * 8) seed = Seed(seed_bin) - seed.subseeds.generate() + seed.subseeds._generate() ss = seed.subseeds assert len(ss.data['long']) == len(ss.data['short']), len(ss.data['short']) assert len(ss) == g.subseeds, len(ss) @@ -158,7 +158,7 @@ class subseed(object): seed_bin = bytes.fromhex('12abcdef' * 8) seed = Seed(seed_bin) - seed.subseeds.generate(ss_count) + seed.subseeds._generate(ss_count) ss = seed.subseeds assert seed.subseed(last_idx).sid == last_sid, seed.subseed(last_idx).sid