Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions contracts/analytics/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(clippy::new_without_default)]
Expand Down
1 change: 1 addition & 0 deletions contracts/bridge/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(
Expand Down
1 change: 1 addition & 0 deletions contracts/compliance_registry/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::needless_borrows_for_generic_args,
Expand Down
2 changes: 1 addition & 1 deletion contracts/crowdfunding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ink_e2e = "5.0.0"
[lib]
name = "propchain_crowdfunding"
path = "src/lib.rs"
crate-type = ["cdylib"]
crate-type = ["cdylib", "rlib"]

[features]
default = ["std"]
Expand Down
3 changes: 2 additions & 1 deletion contracts/crowdfunding/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::arithmetic_side_effects,
Expand All @@ -9,7 +10,7 @@
use ink::storage::Mapping;

#[ink::contract]
mod propchain_crowdfunding {
pub mod propchain_crowdfunding {
use ink::prelude::string::String;
use ink::prelude::vec::Vec;

Expand Down
1 change: 1 addition & 0 deletions contracts/database/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(clippy::new_without_default)]
Expand Down
3 changes: 2 additions & 1 deletion contracts/dex/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(
Expand All @@ -12,7 +13,7 @@ use ink::storage::Mapping;
use propchain_traits::*;

#[ink::contract]
mod dex {
pub mod dex {
use propchain_traits::{non_reentrant, ReentrancyError, ReentrancyGuard};

use super::*;
Expand Down
1 change: 1 addition & 0 deletions contracts/factory/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]

use ink::prelude::string::String;
Expand Down
1 change: 1 addition & 0 deletions contracts/fees/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]

Expand Down
1 change: 1 addition & 0 deletions contracts/fractional/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::needless_borrows_for_generic_args,
Expand Down
1 change: 1 addition & 0 deletions contracts/gdpr/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::needless_borrows_for_generic_args,
Expand Down
1 change: 1 addition & 0 deletions contracts/governance/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::too_many_arguments,
Expand Down
1 change: 1 addition & 0 deletions contracts/hello-world/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(target_family = "wasm", no_std)]
use soroban_sdk::{contract, contractimpl, contracttype, symbol_short, Env, Symbol};

Expand Down
1 change: 1 addition & 0 deletions contracts/identity/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(clippy::needless_borrows_for_generic_args)]
Expand Down
1 change: 1 addition & 0 deletions contracts/insurance/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::arithmetic_side_effects,
Expand Down
1 change: 1 addition & 0 deletions contracts/ipfs-metadata/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]

Expand Down
2 changes: 1 addition & 1 deletion contracts/lending/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ink_e2e = "5.0.0"
[lib]
name = "propchain_lending"
path = "src/lib.rs"
crate-type = ["cdylib"]
crate-type = ["cdylib", "rlib"]

[features]
default = ["std"]
Expand Down
3 changes: 2 additions & 1 deletion contracts/lending/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::arithmetic_side_effects,
Expand All @@ -11,7 +12,7 @@ use ink::storage::Mapping;
mod status_packing;

#[ink::contract]
mod propchain_lending {
pub mod propchain_lending {
use ink::prelude::string::String;
use ink::prelude::vec::Vec;

Expand Down
1 change: 1 addition & 0 deletions contracts/lib/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(clippy::needless_borrows_for_generic_args)]
Expand Down
1 change: 1 addition & 0 deletions contracts/metadata/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(clippy::new_without_default)]
Expand Down
1 change: 1 addition & 0 deletions contracts/mock-oracle/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::arithmetic_side_effects,
Expand Down
1 change: 1 addition & 0 deletions contracts/monitoring/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]

#[ink::contract]
Expand Down
1 change: 1 addition & 0 deletions contracts/multicall/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]

//! # PropChain Multicall Contract
Expand Down
1 change: 1 addition & 0 deletions contracts/oracle/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::arithmetic_side_effects,
Expand Down
1 change: 1 addition & 0 deletions contracts/prediction-market/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::new_without_default,
Expand Down
4 changes: 3 additions & 1 deletion contracts/property-management/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]

Expand All @@ -6,7 +7,7 @@ use ink::storage::Mapping;
use propchain_traits::{non_reentrant, ComplianceChecker, ReentrancyError, ReentrancyGuard};

#[ink::contract]
mod property_management {
pub mod property_management {
use super::*;

pub type TokenId = u64;
Expand Down Expand Up @@ -460,6 +461,7 @@ mod property_management {

impl PropertyManagement {
#[ink(constructor)]
#[allow(clippy::new_without_default)]
pub fn new() -> Self {
let caller = Self::env().caller();
Self {
Expand Down
1 change: 1 addition & 0 deletions contracts/proxy/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]

// Minimal stub for propchain-proxy. The original transparent-proxy-with-upgrade-governance
Expand Down
1 change: 1 addition & 0 deletions contracts/sanctions/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
clippy::needless_borrows_for_generic_args,
Expand Down
1 change: 1 addition & 0 deletions contracts/staking/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![allow(
unused_imports,
Expand Down
1 change: 1 addition & 0 deletions contracts/third-party/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(unexpected_cfgs)]
#![allow(clippy::new_without_default)]
Expand Down
1 change: 1 addition & 0 deletions contracts/traits/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]

// =========================================================================
Expand Down
1 change: 1 addition & 0 deletions contracts/version-registry/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::clone_on_copy)] // fires inside ink! generated storage code
#![cfg_attr(not(feature = "std"), no_std)]

use ink::storage::Mapping;
Expand Down
28 changes: 28 additions & 0 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ propchain-bridge = { path = "../contracts/bridge", default-features = false }
oracle = { path = "../contracts/oracle", default-features = false }
propchain-insurance = { path = "../contracts/insurance", default-features = false }

# Issues #918-#921: contracts under integration test
propchain-dex = { path = "../contracts/dex", default-features = false }
propchain-lending = { path = "../contracts/lending", default-features = false }
propchain-crowdfunding = { path = "../contracts/crowdfunding", default-features = false }
property-management = { path = "../contracts/property-management", default-features = false }

# Async runtime
tokio = { version = "1.0", features = ["full"], optional = true }

Expand Down Expand Up @@ -62,6 +68,10 @@ std = [
"staking/std",
"propchain-bridge/std",
"propchain-insurance/std",
"propchain-dex/std",
"propchain-lending/std",
"propchain-crowdfunding/std",
"property-management/std",
"serde/std",
"serde_json/std",
"tokio",
Expand All @@ -72,3 +82,21 @@ disabled_test = []




# Issues #918-#921: explicit integration-test targets (the package root is
# the tests/ directory itself, so cargo cannot auto-discover test files)
[[test]]
name = "integration_dex"
path = "integration_dex.rs"

[[test]]
name = "integration_lending"
path = "integration_lending.rs"

[[test]]
name = "integration_crowdfunding"
path = "integration_crowdfunding.rs"

[[test]]
name = "integration_property_management"
path = "integration_property_management.rs"
Loading
Loading