second pass: libneard(lib), neard(bin)

Cargo.toml

@@ -67,7 +67,7 @@ node-runtime = { path = "./runtime/runtime" }
 near-jsonrpc = { path = "./chain/jsonrpc" }
 near-network = { path = "./chain/network" }
 
-neard = { path = "./neard/lib" }
+libneard = { path = "./neard/lib" }
 
 testlib = { path = "./test-utils/testlib" }
 
@@ -97,24 +97,24 @@ opt-level = 3 # BLS library is too slow to use in debug
 opt-level = 3 # bs58 library is too slow to use in debug
 
 [features]
-performance_stats = ["neard/performance_stats", "near-network/performance_stats"]
-memory_stats = ["neard/memory_stats"]
-c_memory_stats = ["neard/c_memory_stats"]
-expensive_tests = ["neard/expensive_tests"]
+performance_stats = ["libneard/performance_stats", "near-network/performance_stats"]
+memory_stats = ["libneard/memory_stats"]
+c_memory_stats = ["libneard/c_memory_stats"]
+expensive_tests = ["libneard/expensive_tests"]
 regression_tests = []
 old_tests = []
-adversarial = ["neard/adversarial", "near-jsonrpc/adversarial", "near-store/adversarial"]
-no_cache = ["neard/no_cache"]
-metric_recorder = ["neard/metric_recorder"]
-delay_detector = ["neard/delay_detector"]
-rosetta_rpc = ["neard/rosetta_rpc"]
-nightly_protocol = ["near-primitives/nightly_protocol", "near-jsonrpc/nightly_protocol", "testlib/nightly_protocol", "neard/nightly_protocol"]
-nightly_protocol_features = ["nightly_protocol", "neard/nightly_protocol_features", "protocol_feature_evm", "protocol_feature_block_header_v3", "protocol_feature_alt_bn128", "protocol_feature_add_account_versions", "protocol_feature_tx_size_limit", "protocol_feature_allow_create_account_on_delete", "testlib/nightly_protocol_features"]
-protocol_feature_evm = ["neard/protocol_feature_evm", "testlib/protocol_feature_evm", "runtime-params-estimator/protocol_feature_evm"]
-protocol_feature_alt_bn128 = ["neard/protocol_feature_alt_bn128", "testlib/protocol_feature_alt_bn128", "runtime-params-estimator/protocol_feature_alt_bn128"]
-protocol_feature_block_header_v3 = ["near-primitives/protocol_feature_block_header_v3", "near-chain/protocol_feature_block_header_v3", "neard/protocol_feature_block_header_v3"]
-protocol_feature_tx_size_limit = ["near-primitives/protocol_feature_tx_size_limit", "node-runtime/protocol_feature_tx_size_limit", "neard/protocol_feature_tx_size_limit"]
-protocol_feature_allow_create_account_on_delete = ["testlib/protocol_feature_allow_create_account_on_delete", "near-primitives/protocol_feature_allow_create_account_on_delete", "node-runtime/protocol_feature_allow_create_account_on_delete", "neard/protocol_feature_allow_create_account_on_delete"]
+adversarial = ["libneard/adversarial", "near-jsonrpc/adversarial", "near-store/adversarial"]
+no_cache = ["libneard/no_cache"]
+metric_recorder = ["libneard/metric_recorder"]
+delay_detector = ["libneard/delay_detector"]
+rosetta_rpc = ["libneard/rosetta_rpc"]
+nightly_protocol = ["near-primitives/nightly_protocol", "near-jsonrpc/nightly_protocol", "testlib/nightly_protocol", "libneard/nightly_protocol"]
+nightly_protocol_features = ["nightly_protocol", "libneard/nightly_protocol_features", "protocol_feature_evm", "protocol_feature_block_header_v3", "protocol_feature_alt_bn128", "protocol_feature_add_account_versions", "protocol_feature_tx_size_limit", "protocol_feature_allow_create_account_on_delete", "testlib/nightly_protocol_features"]
+protocol_feature_evm = ["libneard/protocol_feature_evm", "testlib/protocol_feature_evm", "runtime-params-estimator/protocol_feature_evm"]
+protocol_feature_alt_bn128 = ["libneard/protocol_feature_alt_bn128", "testlib/protocol_feature_alt_bn128", "runtime-params-estimator/protocol_feature_alt_bn128"]
+protocol_feature_block_header_v3 = ["near-primitives/protocol_feature_block_header_v3", "near-chain/protocol_feature_block_header_v3", "libneard/protocol_feature_block_header_v3"]
+protocol_feature_tx_size_limit = ["near-primitives/protocol_feature_tx_size_limit", "node-runtime/protocol_feature_tx_size_limit", "libneard/protocol_feature_tx_size_limit"]
+protocol_feature_allow_create_account_on_delete = ["testlib/protocol_feature_allow_create_account_on_delete", "near-primitives/protocol_feature_allow_create_account_on_delete", "node-runtime/protocol_feature_allow_create_account_on_delete", "libneard/protocol_feature_allow_create_account_on_delete"]
 protocol_feature_add_account_versions = ["near-primitives/protocol_feature_add_account_versions"]
 
 # enable this to build neard with wasmer 1.0 runner

Dockerfile

@@ -32,7 +32,7 @@ ENV PORTABLE=ON
 RUN --mount=type=cache,target=/tmp/target \
     --mount=type=cache,target=/usr/local/cargo/git \
     --mount=type=cache,target=/usr/local/cargo/registry \
-    cargo +"$(cat /tmp/rust-toolchain)" build -p neard-bin --release && \
+    cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release && \
     mkdir /tmp/build && \
     cd /tmp/target/release && \
     mv ./neard /tmp/build

Dockerfile.nightly

@@ -32,7 +32,7 @@ ENV PORTABLE=ON
 RUN --mount=type=cache,target=/tmp/target \
     --mount=type=cache,target=/usr/local/cargo/git \
     --mount=type=cache,target=/usr/local/cargo/registry \
-    cargo +"$(cat /tmp/rust-toolchain)" build -p neard-bin --release --features nightly_protocol --features nightly_protocol_features && \
+    cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release --features nightly_protocol --features nightly_protocol_features && \
     mkdir /tmp/build && \
     cd /tmp/target/release && \
     mv ./neard /tmp/build