Skip to content

Problem: rustc in nixpkgs is too old #1469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmsqe merged 3 commits into from
Jun 11, 2024
Merged

Problem: rustc in nixpkgs is too old #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
744d677
Problem: rustc in nixpkgs is too old
mmsqe Jun 10, 2024
576d9ce
point to main
mmsqe Jun 11, 2024
f447c0e
update pyyaml
Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions integration_tests/configs/ibc.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,12 @@ config {
coins: '2234240000000000000cro',
staked: '10000000000000cro',
mnemonic: '${VALIDATOR1_MNEMONIC}',
client_config: {
'broadcast-mode': 'block',
},
base_port: 26800,
},
{
coins: '987870000000000000cro',
staked: '20000000000000cro',
mnemonic: '${VALIDATOR2_MNEMONIC}',
client_config: {
'broadcast-mode': 'block',
},
base_port: 26810,
},
],
Expand Down
3 changes: 0 additions & 3 deletions integration_tests/configs/ibc_rly.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ ibc {
coins: '987870000000000000cro',
staked: '20000000000000cro',
mnemonic: '${VALIDATOR' + i + '_MNEMONIC}',
client_config: {
'broadcast-mode': 'block',
},
base_port: 26800 + i * 10,
}
for i in std.range(1, 2)
Expand Down
10 changes: 8 additions & 2 deletions integration_tests/cosmoscli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ def staking_pool(self, bonded=True):

def transfer(self, from_, to, coins, generate_only=False, fees=None, **kwargs):
kwargs.setdefault("gas_prices", DEFAULT_GAS_PRICE)
return json.loads(
rsp = json.loads(
self.raw(
"tx",
"bank",
Expand All @@ -359,6 +359,9 @@ def transfer(self, from_, to, coins, generate_only=False, fees=None, **kwargs):
**kwargs,
)
)
if rsp["code"] == 0:
rsp = self.event_query_tx_for(rsp["txhash"])
return rsp

def get_delegated_amount(self, which_addr):
return json.loads(
Expand Down Expand Up @@ -1555,7 +1558,7 @@ def register_counterparty_payee(
default_kwargs = {
"home": self.data_dir,
}
return json.loads(
rsp = json.loads(
self.raw(
"tx",
"ibc-fee",
Expand All @@ -1568,6 +1571,9 @@ def register_counterparty_payee(
**(default_kwargs | kwargs),
)
)
if rsp["code"] == 0:
rsp = self.event_query_tx_for(rsp["txhash"])
return rsp

def register_payee(self, port_id, channel_id, relayer, payee, **kwargs):
default_kwargs = {
Expand Down
110 changes: 56 additions & 54 deletions integration_tests/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions integration_tests/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ cprotobuf = "^0.1.11"
flaky = "^3.7"
eth-bloom = "^3.0"
eth-hash = "^0"
pyyaml = "^6.0.2rc1"

[tool.poetry.dev-dependencies]

Expand Down
2 changes: 1 addition & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import sources.nixpkgs {
go-ethereum = pkgs.callPackage ./go-ethereum.nix {
inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
buildGoModule = pkgs.buildGo120Module;
buildGoModule = pkgs.buildGo121Module;
};
flake-compat = import sources.flake-compat;
chain-maind = pkgs.callPackage sources.chain-main { rocksdb = null; };
Expand Down
Loading