Update GasOracle module

starcoinorg · Oct 14, 2022 · b7cc30a · b7cc30a
1 parent 1ecb48d
commit b7cc30a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 12 deletions.
diff --git a/build/StarcoinFramework/source_maps/Oracle.mvsm b/build/StarcoinFramework/source_maps/Oracle.mvsm
diff --git a/build/StarcoinFramework/source_maps/PriceOracle.mvsm b/build/StarcoinFramework/source_maps/PriceOracle.mvsm
diff --git a/build/StarcoinFramework/source_maps/PriceOracleAggregator.mvsm b/build/StarcoinFramework/source_maps/PriceOracleAggregator.mvsm
diff --git a/build/StarcoinFramework/source_maps/PriceOracleScripts.mvsm b/build/StarcoinFramework/source_maps/PriceOracleScripts.mvsm
diff --git a/build/StarcoinFramework/source_maps/STCUSDOracle.mvsm b/build/StarcoinFramework/source_maps/STCUSDOracle.mvsm
diff --git a/integration-tests/daospaceplugin/gas_oracle_plugin.exp b/integration-tests/daospaceplugin/gas_oracle_plugin.exp
@@ -2,13 +2,13 @@ processed 27 tasks
 
 task 5 'run'. lines 67-75:
 {
-  "gas_used": 43598,
+  "gas_used": 46617,
   "status": "Executed"
 }
 
 task 6 'run'. lines 77-85:
 {
-  "gas_used": 74601,
+  "gas_used": 77620,
   "status": "Executed"
 }
 
@@ -59,7 +59,7 @@ task 23 'run'. lines 204-217:
 
 task 24 'run'. lines 219-227:
 {
-  "gas_used": 45306,
+  "gas_used": 48325,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospaceplugin/gas_oracle_plugin.move b/integration-tests/daospaceplugin/gas_oracle_plugin.move
@@ -69,7 +69,7 @@ script {
     use StarcoinFramework::GasOracle;
     use alice::Token::AliceToken;
     fun main(account: signer) {
-        GasOracle::register<AliceToken>(account,9);
+        GasOracle::register_entry<AliceToken>(account,9);
     }
 }
 // check: EXECUTED
@@ -79,7 +79,7 @@ script {
     use StarcoinFramework::GasOracle;
     use alice::Token::AliceToken;
     fun main(account: signer) {
-        GasOracle::init_data_source<AliceToken>(account,0);
+        GasOracle::init_data_source_entry<AliceToken>(account,0);
     }
 }
 // check: EXECUTED
@@ -222,7 +222,7 @@ script {
     use StarcoinFramework::GasOracle;
 
     fun main(account: signer) {
-        GasOracle::update<AliceToken>(account, 100);
+        GasOracle::update_entry<AliceToken>(account, 100);
     }
 }
 

diff --git a/sources/Oracle.move b/sources/Oracle.move
@@ -256,20 +256,33 @@ module PriceOracle {
 
 module GasOracle {
     use StarcoinFramework::PriceOracle;
+
     struct STCToken<phantom TokenType:store> has copy, store, drop {
     }
 
-    public(script) fun register<TokenType:store>(sender: signer, precision: u8){
-        PriceOracle::register_oracle<STCToken<TokenType>>(&sender, precision);
+    public fun register<TokenType:store>(sender: &signer, precision: u8){
+        PriceOracle::register_oracle<STCToken<TokenType>>(sender, precision);
+    }
+    public(script) fun register_entry<TokenType:store>(sender: signer, precision: u8){
+        register<TokenType>(&sender, precision);
+    }
+
+    public fun init_data_source<TokenType: store>(sender: &signer, init_value: u128){
+        PriceOracle::init_data_source<STCToken<TokenType>>(sender, init_value);
     }
 
-    public(script) fun init_data_source<TokenType: store>(sender: signer, init_value: u128){
-        PriceOracle::init_data_source<STCToken<TokenType>>(&sender, init_value);
+    public(script) fun init_data_source_entry<TokenType: store>(sender: signer, init_value: u128){
+        init_data_source<TokenType>(&sender, init_value);
     }
 
-    public(script) fun update<TokenType:store>(sender: signer, value: u128){
-        PriceOracle::update<STCToken<TokenType>>(&sender, value);
+    public fun update<TokenType:store>(sender: &signer, value: u128){
+        PriceOracle::update<STCToken<TokenType>>(sender, value);
     }
+
+    public(script) fun update_entry<TokenType:store>(sender: signer, value: u128){
+        update<TokenType>(&sender, value);
+    }
+
     public fun get_scaling_factor<TokenType: store>(): u128 {
         PriceOracle::get_scaling_factor<STCToken<TokenType>>()
     }