Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
955cce2
refactor: move rust agent to its own repo
hansl Jul 27, 2020
412a47e
Empty commit to trigger CI.
hansl Jul 27, 2020
91b7bc2
Merge branch 'master' into hansl/move-ic-agent-to-own-repo
Jul 27, 2020
0c373ab
Merge branch 'master' into hansl/move-ic-agent-to-own-repo
Jul 28, 2020
524d970
moving to ssh links for github
hansl Jul 29, 2020
0b04d99
Merge remote-tracking branch 'origin/master' into hansl/move-ic-agent…
hansl Jul 29, 2020
e4b0604
new repo name
hansl Jul 29, 2020
09bc78f
fix version
hansl Jul 29, 2020
fb20728
Merge remote-tracking branch 'origin/master' into hansl/move-ic-agent…
hansl Aug 5, 2020
6a50ff7
Fix dependency issues.
hansl Aug 5, 2020
e44d134
fmt
hansl Aug 5, 2020
e1f43bf
cargo clippy
hansl Aug 5, 2020
c899598
Empty commit to trigger CI.
hansl Aug 5, 2020
bd8871d
wip
hansl Aug 6, 2020
f15091c
Merge branch 'master' into hansl/move-ic-agent-to-own-repo
hansl Aug 6, 2020
0ebb8c7
.
hansl Aug 7, 2020
414175b
.
hansl Aug 7, 2020
3a3e399
.
hansl Aug 7, 2020
1ed6895
.
hansl Aug 7, 2020
744f178
Merge branch 'master' into hansl/move-ic-agent-to-own-repo
Aug 7, 2020
d976f90
Merge branch 'master' into hansl/move-ic-agent-to-own-repo
Aug 7, 2020
c6103ce
just empty to run CI
hansl Aug 7, 2020
f4db6d6
fix: Nix eval error due to fetchGit only supporting revisions (#909)
basvandijk Aug 7, 2020
c0b6a0d
try to fix
hansl Aug 8, 2020
274eaf8
remove cargo deps - nobody uses it
hansl Aug 9, 2020
e1a6491
.
hansl Aug 9, 2020
c0b6d27
.
hansl Aug 9, 2020
052d089
.
hansl Aug 9, 2020
ca42ba2
.
hansl Aug 9, 2020
825e625
Merge branch 'master' into hansl/move-ic-agent-to-own-repo
Aug 9, 2020
1a340c9
.
hansl Aug 10, 2020
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
3,771 changes: 1,852 additions & 1,919 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[workspace]
members = [
"src/dfx",
"src/agent/rust",
"src/ic_identity_manager",
]
41 changes: 8 additions & 33 deletions dfx.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,10 @@ let
"^.cargo/config$"
];
cargoTestCommands = _: [
''cargo $cargo_options test $cargo_test_options --workspace --exclude ic-agent''
''RUST_TEST_THREADS=1 cargo $cargo_options test $cargo_test_options -p ic-agent''
''cargo $cargo_options test $cargo_test_options --workspace''
];
override = oldAttrs: {
# both needed for bindgen, used by rocksdb-sys, zstd-sys, lmdb-sys, etc
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib";
CLANG_PATH = "${pkgs.llvmPackages.clang}/bin/clang";
};
};

# add extra executables used when linting
addLintInputs = ws:
ws // {
lint = ws.lint.overrideAttrs (
oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
pkgs.cargo-graph
pkgs.graphviz
];

postDoc = oldAttrs.postDoc + ''
pushd src/dfx
cargo graph | dot -Tsvg > \
../../target/$CARGO_BUILD_TARGET/doc/dfx/cargo-graph.svg
popd
'';

postInstall = oldAttrs.postInstall + ''
echo "report cargo-graph-dfx $doc dfx/cargo-graph.svg" >> \
$doc/nix-support/hydra-build-products
'';
}
);
};

# set DFX_ASSETS for the builds and shells
addAssets = ws:
# override all derivations and add DFX_ASSETS as an environment variable
Expand Down Expand Up @@ -110,6 +79,12 @@ let
# Set CARGO_HOME to minimize interaction with any environment outside nix
export CARGO_HOME=${if pkgs.lib.isHydra then "." else toString ./.}/.cargo-home

if [ ! -d "$CARGO_HOME" ]; then
mkdir -p $CARGO_HOME
echo "[net]
git-fetch-with-cli = true" > $CARGO_HOME/config
fi

# Set environment variable for debug version.
export DFX_TIMESTAMP_DEBUG_MODE_ONLY=$(date +%s)
'';
Expand All @@ -118,6 +93,6 @@ let

in
fixShell (
addStandalone ((addLintInputs (addAssets workspace)))
addStandalone (addAssets workspace)
(throw "this argument is used to trigger the functor and shouldn't actually be evaluated.")
)
5 changes: 3 additions & 2 deletions e2e/bats/basic-project.bash
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ teardown() {
dfx_start
dfx canister create --all
dfx build
INSTALL_REQUEST_ID=$(dfx canister install hello --async)
dfx canister request-status $INSTALL_REQUEST_ID
# INSTALL_REQUEST_ID=$(dfx canister install hello --async)
# dfx canister request-status $INSTALL_REQUEST_ID
dfx canister install hello

assert_command dfx canister call hello greet '("Banzai")'
assert_eq '("Hello, Banzai!")'
Expand Down
2 changes: 0 additions & 2 deletions src/agent/rust/.gitignore

This file was deleted.

29 changes: 0 additions & 29 deletions src/agent/rust/Cargo.toml

This file was deleted.

9 changes: 0 additions & 9 deletions src/agent/rust/README.adoc

This file was deleted.

45 changes: 0 additions & 45 deletions src/agent/rust/src/agent/agent_config.rs

This file was deleted.

71 changes: 0 additions & 71 deletions src/agent/rust/src/agent/agent_error.rs

This file was deleted.

Loading