增加context

ipfs-force-community · Sep 30, 2022 · f4ed329 · f4ed329
1 parent e4dc6df
commit f4ed329
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 14 deletions.
diff --git a/sdk/cases/test.json b/sdk/cases/test.json
@@ -26,6 +26,124 @@
       "params":"",
       "expect_code": 16,
       "expect_message": "test_abort USR_ILLEGAL_ARGUMENT"
+    },
+    {
+      "name": "abort_SYS_SENDER_STATE_INVALID ",
+      "binary": "abort.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "params":"",
+      "method_num": 2,
+      "expect_code": 2,
+      "expect_message": "test_abort SYS_SENDER_STATE_INVALID"
+    },
+    {
+      "name": "ipld_test ",
+      "binary": "ipld.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "message_test ",
+      "binary": "message.wasm",
+      "actor_balance": 0,
+      "send_value": 10,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "sself_test ",
+      "binary": "sself.wasm",
+      "actor_balance": 20,
+      "send_value": 0,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "network_test",
+      "binary": "network.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "gas_test",
+      "binary": "gas.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "debug_log_test",
+      "binary": "debug.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "send_test_SYS_ILLEGAL_INSTRUCTION(resource not found)",
+      "binary": "send.wasm",
+      "actor_balance": 10,
+      "send_value": 0,
+      "params":"",
+      "method_num": 1,
+      "expect_code": 4,
+      "expect_message": "wasm `unreachable` instruction executed"
+    },
+    {
+      "name": "send_test",
+      "binary": "send.wasm",
+      "actor_balance": 10,
+      "send_value": 0,
+      "params":"",
+      "method_num": 2,
+      "expect_code": 0,
+      "expect_message": ""
+    },
+    {
+      "name": "send_test_SYS_ILLEGAL_INSTRUCTION(insufficient funds)",
+      "binary": "send.wasm",
+      "actor_balance": 10,
+      "send_value": 0,
+      "params":"",
+      "method_num": 3,
+      "expect_code": 4,
+      "expect_message": "wasm `unreachable` instruction executed"
+    },
+    {
+      "name": "adt_test",
+      "binary": "adt.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "method_num": 1,
+      "params":"",
+      "expect_code": 0
+    },
+    {
+      "name": "rand_test",
+      "binary": "rand.wasm",
+      "actor_balance": 0,
+      "send_value": 0,
+      "method_num": 1,
+      "params":"",
+      "expect_code": 0
     }
   ]
 }
diff --git a/sdk/env.go b/sdk/env.go
@@ -7,11 +7,12 @@ import (
 	"github.com/ipfs-force-community/go-fvm-sdk/sdk/types"
 )
 
+// CreateSimulateEnv new context of simulated
 func CreateSimulateEnv() context.Context {
-	s := simulated.NewSimulated()
-	return context.WithValue(context.Background(), types.Envkey, s)
+	return context.WithValue(context.Background(), types.SimulatedEnvkey, simulated.NewSimulated())
 }
 
+// CreateEntityEnv new context of entity
 func CreateEntityEnv() context.Context {
-	return context.WithValue(context.Background(), types.Envkey, types.EnvMain)
+	return context.WithValue(context.Background(), types.SimulatedEnvkey, "")
 }
diff --git a/sdk/sys/context.go b/sdk/sys/context.go
@@ -15,7 +15,6 @@ func VMContext(ctx context.Context) (*types.InvocationContext, error) {
 	if env, ok := isSimulatedEnv(ctx); ok {
 		return env.VMContext()
 	}
-
 	var result types.InvocationContext
 	code := vmContext(uintptr(unsafe.Pointer(&result)))
 	if code != 0 {

diff --git a/sdk/sys/env.go b/sdk/sys/env.go
@@ -8,6 +8,6 @@ import (
 )
 
 func isSimulatedEnv(ctx context.Context) (*simulated.Fsm, bool) {
-	env, ok := ctx.Value(types.Envkey).(*simulated.Fsm)
+	env, ok := ctx.Value(types.SimulatedEnvkey).(*simulated.Fsm)
 	return env, ok
 }
diff --git a/sdk/sys/env_test.go b/sdk/sys/env_test.go
@@ -10,8 +10,7 @@ import (
 )
 
 func Test_isSimulatedEnv(t *testing.T) {
-	s := simulated.NewSimulated()
-	ctx := context.WithValue(context.Background(), types.Envkey, s)
+	ctx := context.WithValue(context.Background(), types.SimulatedEnvkey, simulated.NewSimulated())
 	_, got := isSimulatedEnv(ctx)
 	if !reflect.DeepEqual(got, true) {
 		t.Errorf("isSimulatedEnv() got = %v, want %v", got, true)

diff --git a/sdk/types/key.go b/sdk/types/key.go
@@ -20,10 +20,6 @@ func (k StringKey) Key() string {
 	return string(k)
 }
 
-var (
-	Envkey = "envkey"
-)
-var (
-	EnvSimulated = "entity"
-	EnvMain    = "entity"
-)
+type emptyKeyType struct{}
+
+var SimulatedEnvkey emptyKeyType