From 32efa54bbfa0ee84109d339e6af268f28f472af7 Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Thu, 7 Nov 2019 12:17:23 +0100 Subject: [PATCH] [examples] lang2/Delegator: fix some warnings and added Delegator::get --- examples/lang2/delegator/.ink/abi_gen/main.rs | 2 +- examples/lang2/delegator/build-all.sh | 2 +- examples/lang2/delegator/lib.rs | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/lang2/delegator/.ink/abi_gen/main.rs b/examples/lang2/delegator/.ink/abi_gen/main.rs index 9fa36177..cbd88464 100644 --- a/examples/lang2/delegator/.ink/abi_gen/main.rs +++ b/examples/lang2/delegator/.ink/abi_gen/main.rs @@ -1,5 +1,5 @@ fn main() -> Result<(), std::io::Error> { - let abi = contract::ink_generate_abi(); + let abi = ::generate_abi(); let contents = serde_json::to_string_pretty(&abi)?; std::fs::create_dir("target").ok(); std::fs::write("target/abi.json", contents)?; diff --git a/examples/lang2/delegator/build-all.sh b/examples/lang2/delegator/build-all.sh index 8b5dd7c7..ff76cf9d 100755 --- a/examples/lang2/delegator/build-all.sh +++ b/examples/lang2/delegator/build-all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env +#!/usr/bin/env bash pushd accumulator && cargo contract build && popd && pushd adder && cargo contract build && popd && diff --git a/examples/lang2/delegator/lib.rs b/examples/lang2/delegator/lib.rs index 603a3bc8..dbfbca1f 100644 --- a/examples/lang2/delegator/lib.rs +++ b/examples/lang2/delegator/lib.rs @@ -94,6 +94,11 @@ mod delegator { self.adder.set(adder.clone()); self.subber.set(subber.clone()); } + /// Returns the accumulator's value. + #[ink(message)] + fn get(&self) -> i32 { + self.accumulator.get().get() + } /// Delegates the call to either `Adder` or `Subber`. #[ink(message)] @@ -105,6 +110,7 @@ mod delegator { } /// Switches the delegator. + #[ink(message)] fn switch(&mut self) { match *self.which { Which::Adder => { -- GitLab