Skip to content

Commit

Permalink
Gh 784 review four (#521)
Browse files Browse the repository at this point in the history
* continue of code review changes

* test for panic in handle_retrieve_transactions

* fixing more comments from review

* removing TODO

* implementing review, added two new tests for ip_country

* removing unnecesary country_code from node_descriptor

* added cfg(test) and cfg(not(test)) for static ref COUNTRY_CODE_FINDER, created test_dbip_country.rs

* change country_code member of NodeRecordInner_0v1 to country_code_opt

* simplifying tests in node_record.rs and neighborhood_database.rs

* resolving review comments

* final changes in gossip_acceptor from review

* continue of implementing review comments

* fix test return value

* added ip_country to ci/all.sh

* cherry-pick from GH-784-fix-for-Vojta and implementing iterator for deserializer

* try to create test for fmt

* tests for print ip v4 and v6 vec[u8] in country_block_serde.rs

* ci for ip_country + resolved conflicts of clippy

* masq_lib dependencies solved

* dependency masq_lib for ip_country in node workspace

* remove commented out code + fix condition for non empty bit_queue

* formatting

* 5 seconds for wait_for_log in requested_chain_meets_different_db_chain_and_panics_integration

* fixing impl for AGR in multinode tests

* formatting

* fix nonexistent NodeAddr in multinode tests for AGR

* change single match to if

* try to fix build in actions for MacOS

* try to find out disk space on MacOS container in Actions

* add diagnostics commands on failure

* check diskspace before ci/all.sh workflow runs

* diagnose mounted disks

* analyze /var/ diskspace

* remove advanced diagnosticst for disk space

* switch macos to version 13

* diagnostics for /Users/runner/work/Node/Node/node/target/release

* fasten diagnostics

* fasten diagnostics fix

* fasten diagnostics back

* GH-784-review-two-state: fixes that could work on Actions, appeasing it

* fixing review

* implementing CountryBlock count in generated rs file, and infrastructure

* fixing ip_country tests

* fix import of ip_country to multinode_integration_tests

* formatting

* fix the reference for COUNTRY_CODE_FINDER

* implemenitng initalization checker for COUNTRY_CODE_FINDER

* CountryCodeFinder initializer

* fixed comments from review

* removed custom PartialEq for NodeLocation

* get back with COUNTRY_CODE_FINDER

---------

Co-authored-by: Bert <[email protected]>
  • Loading branch information
czarte and Bert authored Sep 23, 2024
1 parent 68f3c04 commit a5e8cf2
Show file tree
Hide file tree
Showing 43 changed files with 64,180 additions and 63,652 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/ci-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
target:
- { name: linux, os: ubuntu-22.04 }
- { name: macos, os: macos-12 }
- { name: macos, os: macos-14 }
- { name: windows, os: windows-2022 }

name: Build node on ${{ matrix.target.os }}
Expand Down Expand Up @@ -51,6 +51,11 @@ jobs:
with:
name: Node-${{ matrix.target.name }}
path: results
- name: diagnostics
if: failure()
run: |
echo "final disc diagnostics ------>"
df -h /Users/runner/work/Node/Node/node/target/release
deploy_to_s3:
needs: build
strategy:
Expand Down Expand Up @@ -100,4 +105,4 @@ jobs:
PATHS: "/Node*"
AWS_REGION: "us-west-2"
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6 changes: 6 additions & 0 deletions ci/all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,10 @@ cd "$CI_DIR/../automap"
ci/all.sh "$PARENT_DIR"
echo "*** AUTOMAP TAIL ***"
echo "*********************************************************************************************************"
echo "*********************************************************************************************************"
echo "*** IP COUNTRY HEAD ***"
cd "$CI_DIR/../ip_country"
ci/all.sh "$PARENT_DIR"
echo "*** IP COUNTRY TAIL ***"
echo "*********************************************************************************************************"

1 change: 1 addition & 0 deletions ci/format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ format "$CI_DIR"/../dns_utility
format "$CI_DIR"/../masq
format "$CI_DIR"/../multinode_integration_tests
format "$CI_DIR"/../port_exposer
format "$CI_DIR"/../ip_country

exit $final_exit_code
Loading

0 comments on commit a5e8cf2

Please sign in to comment.