feat/use-TestSetRealm-in-testcases (#239)

* feat: apply gno new testing api `TestSetRealm` * fix: typo filename
gnoswap-labs · Jun 19, 2024 · f4cf494 · f4cf494
1 parent 0aed9f6
commit f4cf494
Show file tree

Hide file tree

Showing 60 changed files with 735 additions and 701 deletions.
diff --git a/README.md b/README.md
@@ -14,13 +14,13 @@ $ export WORKDIR=~/work
 
 ### Build Gno.land for Gnoswap
 
-Clone the `gno` repository from `gnoswap-labs`. And switch to the `master_20240401` branch. You will be able to clone the repository and build it after running the following commands:
+Clone the `gno` repository from `gnoswap-labs`. And switch to the `master_240619` branch. You will be able to clone the repository and build it after running the following commands:
 
 ```
 $ cd $WORKDIR
 $ git clone https://github.com/gnoswap-labs/gno.git gno
 $ cd gno
-$ git checkout master_gs
+$ git checkout master_240619
 $ make install
 ```
 

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/...EST_/_TEST_0_INIT_TOKEN_REGISTER_test.gno → ...ST_/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/...EST_/_TEST_0_INIT_TOKEN_REGISTER_test.gno → ...ST_/__TEST_0_INIT_TOKEN_REGISTER_test.gno
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
@@ -26,6 +26,13 @@ var (
  maxApprove uint64 = 18446744073709551615
 )
 
+// Realms to mock frames
+var (
+ gsaRealm = std.NewUserRealm(gsa)
+ posRealm = std.NewCodeRealm(consts.POSITION_PATH)
+ rouRealm = std.NewCodeRealm(consts.ROUTER_PATH)
+)
+
 /* HELPER */
 func shouldEQ(t *testing.T, got, expected interface{}) {
  if got != expected {

diff --git a/pool/_TEST_/z0_rpc_filetest.gno → pool/_TEST_/__TEST_Z_z0_rpc_filetest.gnoA b/pool/_TEST_/z0_rpc_filetest.gno → pool/_TEST_/__TEST_Z_z0_rpc_filetest.gnoA
@@ -40,6 +40,12 @@ var (
  t *testing.T
 )
 
+var (
+ gsaRealm = std.NewUserRealm(gsa)
+ posRealm = std.NewCodeRealm(consts.POSITION_PATH)
+ rouRealm = std.NewCodeRealm(consts.ROUTER_PATH)
+)
+
 type FooToken struct{}
 
 func (FooToken) Transfer() func(to pusers.AddressOrName, amount uint64) {
@@ -149,10 +155,12 @@ func (GNSToken) Approve() func(spender pusers.AddressOrName, amount uint64) {
 }
 
 func init() {
- std.TestSetPrevAddr(gsa)
+ std.TestSetRealm(gsaRealm)
 
  // TOKEN REGISTER
- std.TestSetPrevAddr(gsa)
+ std.TestSetRealm(gsaRealm)
+ std.TestSetOrigCaller(gsa)
+
  pl.RegisterGRC20Interface("gno.land/r/demo/bar", FooToken{})
  pl.RegisterGRC20Interface("gno.land/r/demo/foo", BarToken{})
  pl.RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
@@ -173,7 +181,7 @@ func main() {
 }
 
 func createFooBarPool() {
- std.TestSetPrevAddr(gsa)
+ std.TestSetRealm(gsaRealm)
 
  gns.Approve(a2u(consts.POOL_ADDR), consts.POOL_CREATION_FEE)
  std.TestSkipHeights(1)
@@ -186,7 +194,7 @@ func createFooBarPool() {
 }
 
 func createBarBazPool() {
- std.TestSetPrevAddr(gsa)
+ std.TestSetRealm(gsaRealm)
 
  gns.Approve(a2u(consts.POOL_ADDR), consts.POOL_CREATION_FEE)
  std.TestSkipHeights(1)
@@ -199,12 +207,12 @@ func createBarBazPool() {
 }
 
 func mintFooBar() {
- std.TestSetPrevAddr(gsa)
+ std.TestSetRealm(gsaRealm)
  foo.Approve(a2u(consts.POOL_ADDR), consts.UINT64_MAX)
  bar.Approve(a2u(consts.POOL_ADDR), consts.UINT64_MAX)
  std.TestSkipHeights(2)
 
- //std.TestSetPrevRealm(consts.POSITION_PATH)
+ //std.TestSetRealm(posRealm)
  //std.TestSetOrigCaller(gsa)
  amount0, amount1 := pl.Mint(
  barPath,
@@ -224,12 +232,12 @@ func mintFooBar() {
 }
 
 func mintBarBaz() {
- std.TestSetPrevAddr(gsa)
+ std.TestSetRealm(gsaRealm)
  bar.Approve(a2u(consts.POOL_ADDR), consts.UINT64_MAX)
  baz.Approve(a2u(consts.POOL_ADDR), consts.UINT64_MAX)
  std.TestSkipHeights(2)
 
- //std.TestSetPrevRealm(consts.POSITION_PATH)
+ //std.TestSetRealm(posRealm)
  //std.TestSetOrigCaller(gsa)
  amount0, amount1 := pl.Mint(
  barPath,