Skip to content

Commit

Permalink
merge master into working branch (#277)
Browse files Browse the repository at this point in the history
* fix: replaced old copyright in scripts with masq copyright (#240)

* fix: replaced sub copyright with masq copyright

* fix: updated copyright to single year instead of range

---------

Co-authored-by: Bert <65427484+bertllll@users.noreply.github.com>

* GH-688: HOTFIX: Remove version incompatibility issue that's occurring on v0.7.2 (#259)

* GH-688: rename the field originator_alias_public_key to originator_public_key

* GH-688: renames in multinode test

* GH-688: increase the hard limit for bookkeeping test from 3.5s to 7s

---------

Co-authored-by: KauriHero <kaurihero@masq.ai>

* GH-671: base for PaymentAdjuster-checked payables (#233)

* GH-671: started with the reconstruction slowly; however, found weakness in an older test and designed a test tool, eventually bracing it up

* GH-671: I stopped before I create another branch to fix some discrepancy in the test tree (adding tests + I wanna move my new test utility there too)

* testing_area_fixes: one test counted on a premise that could not be matched with the test tooling we had; I created a new kind and fixed the test

* GH-673: making three tests into more stronger ones; these will embrace also certain use of self.handle_scan()

* GH-673: first phase of smooth use of stop conditions for recorder

* GH-673: first moment hitting wall hard

* GH-673: StopConditions considered implemented; might change some details

* GH-673: added some tests... of test code...

* GH-673: finishing tests and adding required PartialEq and Eq traits to some messages

* GH-673: most of things from the review addressed; preparing for reducing the Single cond, experimenting

* GH-673: review answered

* GH-673: adding notify later 'facelift'

* GH-673: simplifying default impl for NotifyLaterHandler

* GH-671: merge from GH-673 finished

* GH-671: interim commit

* GH-671: blockchain bridge with implemented check for balances for payables

* GH-671: enclosed the circle; functionality stable again; fully tested; next some reviewing

* GH-671: last changes begun with auto review

* GH-671: formatting

* GH-671: removing www.failingFailing.com as non-http anymore for www.neverssl.com

* GH-671: formatting

* GH-671: first part of addressing the review

* GH-671: problematic parts that required discussion resolved now

* GH-671: refactoring my older code in setup_reporter.rs so that it makes more sense

* GH-671: weis of gwei constant renamed

* GH-671: making function clearer by using better names for variables etc

* GH-671: added a comment to explain more about the fn

* GH-671: little mistake in multinode tests

---------

Co-authored-by: Bert <Bert@Bert.com>

* GH-675: Find Alternative to route -n in Linux (#251)

* GH-662: Write tests for usages of 'panic_on_migration()' (#267)

* GH-662: Established a single function to test panic_on_migration

* GH-662: Tested a frew more occurrences

* GH-662: Finished last test

* GH-662: Fixed all warning messages & formatting

* GH-622: Decreased last_remapped duration for maybe_remap_handles_remapping_error

* Revert "GH-622: Decreased last_remapped duration for maybe_remap_handles_remapping_error"

This reverts commit 5d1e009.

* GH-662: Amended Subjects name

* bump version from v0.7.2 to v0.7.3 (#272)

* GH-629: Batch request for redeeming multiple payables + the payable and pending_payable machinary reworked to request the DB do multiple operations in a single transactions  (#190)

* GH-629: basic structure exists

* GH-629: interim commit

* GH-629: test for the transfer of tokens via batch transport is roughly ready; detailed hash values will be added later

* GH-629: main contoures made and will think how to finish it to the working state

* GH-629: in the middle of big rearrangement of connections between types and errors and also continuing work on send_payables_within_batch

* GH-629: finaly compiling; after a lot of changes in data structures; new error handling system

* GH-629: problem with signed_transaction; now it seems like I cannot get it before I dispatch the batch out and wait for the response; will go on an experiment

* GH-629: the base test is complete and passing... still a lot of work ahead

* GH-629: another big test starts passing

* GH-629: interim commit

* GH-629: improving blockchain bridge and testing and testing, and...

* GH-629: fixed a couple of things in the joint with blockcahin bridge; old BB tests are passing

* GH-629: pretty printed error messages; very simple tests fixes, changing the way we ask about the nonce for upcoming transactions

* GH-629: advancing it repairing tests; but also continuous refactoring imperfections and adding logs

* GH-629: in the middle of the transition from one fingerprint processed in a time to group processing, on probably all related methods

* GH-629: continuation of implementing batch like processing for payable DAO and pending payable DAO ... quite a lot of todostatus still left

* GH-629: mark_pending_payable() is fully implemented, I'm gonna switch to a deal with delete_fingerprints() now

* GH-629: fixing more paths in handle_sent_payable(); also finished delete_fingerprints(); next probably concerns about tx receipt methods

* GH-629: in the middle of reconstructure of pending payable (receipts, etc...) methods, trying hard for simplification

* GH-629: confirming txs, deleting and updating of fingerprints reimplemented; now before the cancelation process reconstruction

* GH-629: all old tests fixed and some portion above; logging better setup, minor things

* GH-629: removed optionality at fields

* GH-629: last TODOs knocked off

* GH-629: first repair after my auto review

* GH-629: a few more corrections from an auto review

* GH-629: later fixes after diving more into the code when GH didn't let the card go through; refactoring the blockchain interface batch function (especially handling the right initial nonce to start with)

* GH-629: trying to find a way how to get the proper row changes count - hopwfully this prototype is that right away

* GH-629: fix for multi-record update transaction; and streightening the existing tests for other multi operations

* GH-629: added a performance test for multi-record update sql with a case statement in it

* GH-629: extra helper for detecting panics connected to repeated payaments

* GH-629: more accure testing of performance of multirow update sql

* GH-629: my own remarks turned into modyfications as well as things from the Steve's review

* GH-629: modifying test slightly to pass in Actions

* GH-629: tuning performance tests in payable dao

* GH-629: interim commit - a performance wise integration test half done for payable dao

* GH-629: trying performance integration test in Actions

* GH-629: another adjustment in the effort for making the integ test reliably run

* GH-629: formatting

* GH-629: another adjustmen; also loosser requirements within my coeficients

* GH-629: another aproachment to the optimum; adding the fifth attempt to make the metrics brighter

* GH-629: cleaning up aftereffects of the master merge; not finished. To be continued.

* GH-629: finished merge of v0.7.0 and had to modify a couple of things to work properly; also added better explanation of ArbitraryIdStamp

* GH-629: fixing conficts in multinode tests and formatting

* GH-629: fixed platform specifically behaving test

* GH-629: test fix and adjustment of another one

* GH-629: I revamped the text explaining ArbitraryIdStamp and made the performance int test more predictable

* GH-629: reduced some of the compilation errors considerably; nearing to the softest tissues and smallest nuances, huh; gonna call a plastic surgeon

* GH-629: another portion of restored tests and some production code shifting and rewriting...still merging

* GH-629: repaired scanners to the probable compilation state; progress on other places too but some discrepancy is remaining and overally not compilling

* GH-629: failing tests almost resolved; a few last to go

* GH-629: finally all test passing; but will have to go through todos I left behind

* GH-629: fixed; now knocking off todos; before trying PendingPayableId with a constructor

* GH-629: PendingPayableId constructor added

* GH-629: new portion of killed todos and some refactoring...; going on is necessary though

* GH-629: merging beleived done; but one integration test is failing

* GH-629: one older integration test repaired

* GH-629: removed tests to be worked out in a diff card; plus some cosmetics

* GH-629: the first few things fixed

* GH-629-Dan-review-two: interim commit

* GH-629-Dan-review-two: a lot more fixed; a savepoint before trying to refactor too a long method

* GH-629-Dan-review-two: Sorry, new MERGE OF MASTER is coming; otherwise more things from reviews addressed

* GH-629-Dan-review-teo: another big chunk of fixed things for the review

* GH-629-Dan-review-two: some more fixed items

* GH-629-Dan-review-two: made error distinguishing eaiser and nicer for eyes; aslo fixed a bug in handle_report_accounts_payable

* GH-629-Dan-review-two: a big bunch of other newly fixed things; a few tougher ones are left

* GH-629-Dan-review-two: some significant refactoring of a DAO fn

* GH-629-Dan-review-two: interim commit

* GH-629-Dan-review-two: a save-point, still dealing with the finished review; fixing the space for failed transactions and their handling

* GH-629-Dan-review-two: all I know of from the review is fixed by now

* GH-629: accountant/dao_utils is fixed

* GH-629: pending_payable_dao fixed

* GH-629: mostly fixes of stuff tied up with scanners, daos and a little bit of blockcahin bridge

* GH-629: error messaging for failed mark_pending_payables_rowids fixed

* GH-629: added a few more fixes

* GH-629: save point before trying to come up with better explanation of an arbitrary id

* GH-629: last fixes, also better examples for how to implement ArbitraryIdStamp

* GH-629: review 3 answered

* GH-629: little fix in a test

* GH-629: getting cargo files up to date in their version

* GH-629: fixes for old bad comments

* GH-629: found and fix issue in utils for special integration test without init config

---------

Co-authored-by: Bert <Bert@Bert.com>

---------

Co-authored-by: Bert <65427484+bertllll@users.noreply.github.com>
Co-authored-by: Utkarsh Gupta <32920299+utkarshg6@users.noreply.github.com>
Co-authored-by: KauriHero <kaurihero@masq.ai>
Co-authored-by: Bert <Bert@Bert.com>
Co-authored-by: Syther007 <99961126+Syther007@users.noreply.github.com>
  • Loading branch information
6 people authored May 7, 2023
1 parent 9363ac4 commit fb65831
Show file tree
Hide file tree
Showing 90 changed files with 7,323 additions and 3,656 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017-2019, Substratum LLC (https://substratum.net) and/or its affiliates. All rights reserved.
# Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
/target/
/results/
**/*.rs.bk
Expand Down
Loading

0 comments on commit fb65831

Please sign in to comment.