removed simulate and checkTx requirement with whitelist conditional

bluzelle · Aug 13, 2021 · 986fc71 · 986fc71
1 parent a0e647f
commit 986fc71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/ante/NewSetUpContextDecorator.go b/app/ante/NewSetUpContextDecorator.go
@@ -121,7 +121,7 @@ func SetGasMeter(simulate bool, ctx sdk.Context, gasLimit uint64, tx sdk.Tx, gk
 	}
 
 
-	if isOnWhiteListAndFree && !simulate && !ctx.IsCheckTx() {
+	if isOnWhiteListAndFree {
 		fmt.Println("ON WHITE LIST, ASSIGNING GAS METER")
 		gm := gasmeter.NewFreeGasMeter(gasLimit)
 		gk.AddGasMeter(&gm)

diff --git a/test/integration/specs/nft/whitelist.spec.ts b/test/integration/specs/nft/whitelist.spec.ts
@@ -20,7 +20,7 @@ describe('whitelist', function()  {
     this.timeout(6000000);
     let bz: API
 
-    beforeEach(() => getAPIAndSwarm(mattnetConfig)
+    beforeEach(() => getAPIAndSwarm(mattnetConfig, true)
         .then(({bz: newBz}) => bz = newBz)
     )
     // beforeEach(() =>
@@ -39,7 +39,7 @@ describe('whitelist', function()  {
     });
 
     it('should not charge for all accounts on the whitelist', () => {
-        return Promise.all<API>(times(10).map(() =>
+        return Promise.all<API>(times(5).map(() =>
             createMintedBz()
         ))
             .then(passThroughAwait((clients : API[]) =>
@@ -63,7 +63,7 @@ describe('whitelist', function()  {
     });
 
     it("should charge everybody if whitelist is empty", () => {
-        return Promise.all<API>(times(10).map(() =>
+        return Promise.all<API>(times(5).map(() =>
             createMintedBz()
         ))
             .then((clients: API[]) => Promise.all(clients.map((client, idx) => checkGasWasCharged(client, `nft-id-${idx}`))))